From 2ffade21c728ef905294aa6707a9924055afad4d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 16 十二月 2025 16:23:24 +0800
Subject: [PATCH] 新增设备维修保养过程描述

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

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index dffcdd5..b10f1e9 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -5,7 +5,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 @Data
 public class DeviceMaintenanceDto {
@@ -16,7 +16,7 @@
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    private Long deviceLedgerId;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -25,13 +25,19 @@
     private String deviceModel;
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private Date maintenancePlanTime;
+    private String maintenancePlanTimeReq;
+
+    @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+    private LocalDateTime maintenancePlanTime;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private Date maintenanceActuallyTime;
+    private LocalDateTime maintenanceActuallyTime;
+
+    @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+    private String maintenanceActuallyTimeReq;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
     private Integer maintenanceResult;
@@ -41,11 +47,11 @@
 
     @ApiModelProperty("鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty("鏇存柊鏃堕棿")
     @TableField(fill = FieldFill.UPDATE)
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @ApiModelProperty("鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
@@ -58,4 +64,10 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @ApiModelProperty("鍒涘缓浜哄悕绉�")
+    private String createUserName;
+
+    @ApiModelProperty("淇濆吇杩涘害鎻忚堪")
+    private String maintenanceProcessDesc;
 }

--
Gitblit v1.9.3