From e772b3d8cf395e9d441419373d883601350fbf0b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 17 六月 2026 16:19:09 +0800
Subject: [PATCH] 设备保养内容字段增加

---
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 2294338..7cf5874 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -22,6 +22,9 @@
     @Schema(description = "璁惧鍙拌处id")
     private Long deviceLedgerId;
 
+    @Schema(description = "璁惧鍖哄煙ID")
+    private Long areaId;
+
     @Schema(description = "淇濆吇浠诲姟id")
     private Long maintenanceTaskId;
 
@@ -37,7 +40,7 @@
     @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
     private LocalDateTime lastExecutionTime;
 
-    @Schema(description = "璁惧绫荤洰")
+    @Schema(description = "璁惧椤圭洰")
     private String machineryCategory;
 
 
@@ -61,9 +64,23 @@
     @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
     private String maintenanceResult;
 
-    @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
+    @Schema(description = "淇濆吇鍐呭")
+    private String maintenanceContent;
+
+    @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触 3 寰呴獙鏀�")
     private Integer status;
 
+    @Schema(description = "楠屾敹浜�")
+    private String acceptanceName;
+
+    @Schema(description = "楠屾敹鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime acceptanceTime;
+
+    @Schema(description = "楠屾敹澶囨敞")
+    private String acceptanceRemark;
+
     @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

--
Gitblit v1.9.3