From 79054eef527c991f9a84ab3bc3fd2603a5521eb1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 26 一月 2026 12:45:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index cb6dd6c..522a324 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -27,13 +27,13 @@
     private String maintenancePlanTimeReq;
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private LocalDateTime maintenancePlanTime;
+    private String maintenancePlanTime;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private LocalDateTime maintenanceActuallyTime;
+    private String maintenanceActuallyTime;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
     private String maintenanceActuallyTimeReq;

--
Gitblit v1.9.3