Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_帮太优选' into dev_pro_河南鹤壁_帮太优选

gongchunyi

6 天以前 3c5026167c78b4809afe1d99ad00464aeb503158

Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_帮太优选' into dev_pro_河南鹤壁_帮太优选

 .gitignore

@@ -6,6 +6,7 @@
!gradle/wrapper/gradle-wrapper.jar

claude.md

target/

test/

!.mvn/wrapper/maven-wrapper.jar



######################################################################


 src/test/java/com/ruoyi/device/service/impl/MaintenanceTaskJobTest.java

@@ -373,6 +373,7 @@
        record.setMaintenanceTaskId(task.getId());
        record.setDeviceLedgerId(task.getTaskId());
        record.setMaintenancePlanTime(executionDate);
        record.setMaintenanceActuallyTime(executionDate);
        record.setMaintenanceActuallyName(task.getMaintenancePerson());
        record.setFrequencyType(task.getFrequencyType());
        record.setFrequencyDetail(task.getFrequencyDetail());