From ee0be3d2f2a90094506e8f817098762a5b9d9a7e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 10 十二月 2025 13:15:05 +0800
Subject: [PATCH] yys 修改bug

---
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 431188d..c018e4d 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -20,19 +20,28 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
+
+
+    private String deviceName;
+
+    private String deviceModel;
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private Date maintenancePlanTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenancePlanTime;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private Date maintenanceActuallyTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceActuallyTime;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
-    private Integer maintenanceResult;
+    private String maintenanceResult;
 
     @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
     private Integer status;

--
Gitblit v1.9.3