Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceInfoService.java

@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.DeviceInfo;
import org.jeecg.modules.dnc.response.CommonGenericTree;
import org.jeecg.modules.dnc.ucenter.UserDepartExt;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;

import java.util.Collection;