From 3c5026167c78b4809afe1d99ad00464aeb503158 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 25 五月 2026 00:42:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_帮太优选' into dev_pro_河南鹤壁_帮太优选
---
.gitignore | 1 +
src/test/java/com/ruoyi/device/service/impl/MaintenanceTaskJobTest.java | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index d3f800c..797d1c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
!gradle/wrapper/gradle-wrapper.jar
claude.md
target/
+test/
!.mvn/wrapper/maven-wrapper.jar
######################################################################
diff --git a/src/test/java/com/ruoyi/device/service/impl/MaintenanceTaskJobTest.java b/src/test/java/com/ruoyi/device/service/impl/MaintenanceTaskJobTest.java
index 0c41f05..89dcb16 100644
--- a/src/test/java/com/ruoyi/device/service/impl/MaintenanceTaskJobTest.java
+++ b/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());
--
Gitblit v1.9.3