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

云

3 天以前 837e27591dffbdf27100c2915300ddfceb64919c

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

@@ -96,6 +96,7 @@
        inspectionTask.setTenantId(timingTask.getTenantId());
        inspectionTask.setStatus(0);
        inspectionTask.setDeviceModel(timingTask.getDeviceModel());
        inspectionTask.setMachineryCategory(timingTask.getMachineryCategory());
        inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
        inspectionTask.setUpdateTime(LocalDateTime.now());
        inspectionTask.setCreateTime(LocalDateTime.now());