Merge branch 'hhk' into main

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -136,15 +136,15 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
         DeviceLedgerDO deviceLedgerDO = deviceLedgerMapper.selectById(id);
         Map<String,List<DvRepairLineDO>> dvRepairDOMap=new HashMap<>();
 
-
+        //TODO 待修改迁移
         //点检列表
-        List<TicketResultsDO> inspectionList = ticketResultsMapper.findByDeviceIdAndPlanType(id, PlanTypeEnum.INSPECTION.getCode(),"","","");
+        List<TicketResultsDO> inspectionList = ticketResultsMapper.findByDeviceIdAndPlanType(id, PlanTypeEnum.INSPECTION.getCode(),null,null,null);
         if(CollectionUtils.isNotEmpty(inspectionList)){
             deviceLedgerDO.setInspectionList(inspectionList);
         }
 
         //保养列表
-        List<TicketResultsDO> maintainList = ticketResultsMapper.findByDeviceIdAndPlanType(id, PlanTypeEnum.MAINTENANCE.getCode(),"","","");
+        List<TicketResultsDO> maintainList = ticketResultsMapper.findByDeviceIdAndPlanType(id, PlanTypeEnum.MAINTENANCE.getCode(),null,null,null);
         if(CollectionUtils.isNotEmpty(maintainList)){
             deviceLedgerDO.setMaintainList(maintainList);
         }