Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

8 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java

@@ -93,6 +93,7 @@
        inspectionTask.setMaintenanceTaskId(timingTask.getId());
        inspectionTask.setDeviceLedgerId(timingTask.getTaskId());
        inspectionTask.setMaintenancePlanTime(LocalDateTime.now());
        inspectionTask.setMaintenanceActuallyName(timingTask.getMaintenancePerson());
        inspectionTask.setFrequencyType(timingTask.getFrequencyType());
        inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
        inspectionTask.setTenantId(timingTask.getTenantId());