From ae659b7fe99a8862082a4ba4bb24148a2a6727ca Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 08 十月 2026 16:57:40 +0800
Subject: [PATCH] feat(芯导): 仓储物流出库 / 人力资源(离职/在职/合同/薪资) / 环保门禁(门禁+智能巡检) 后端

---
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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..f5d5463 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -20,16 +20,25 @@
     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;

--
Gitblit v1.9.3