Merge remote-tracking branch 'origin/master'

lyh

2025-06-05 3414326f13fcd0f5dc88b8a7e69db96f66b1d363

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DocRelativeMapper.java

@@ -4,6 +4,7 @@
import org.jeecg.modules.dnc.entity.DeviceInfo;
import org.jeecg.modules.dnc.entity.DocRelative;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.entity.MdcEquipment;

import java.util.List;

@@ -13,5 +14,5 @@
     * @param docId
     * @return
     */
    List<DeviceInfo> findDeviceByDocId(@Param("docId") String docId);
    List<MdcEquipment> findDeviceByDocId(@Param("docId") String docId);
}