From 644f2477e11b663dad53f05e4c52315916265911 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 四月 2025 17:30:41 +0800
Subject: [PATCH] art: 设备管理-周保-字段添加,保养状态修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 2a8b2a6..6c4d814 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -81,7 +81,7 @@
 	private String operator;
 	/**淇濆吇鐘舵��*/
     @ApiModelProperty(value = "淇濆吇鐘舵��")
-	@Dict(dicCode = "maintenance_status")
+	@Dict(dicCode = "week_maintenance_status")
 	private String maintenanceStatus;
 	/**鍒涘缓鏂瑰紡*/
     @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
@@ -102,6 +102,37 @@
 	/**澶囨敞*/
     @ApiModelProperty(value = "澶囨敞")
 	private String remark;
+	/**纭鎰忚*/
+	@ApiModelProperty(value = "纭鎰忚")
+	private String confirmComment;
+	/**鍒濋獙鏀朵汉*/
+	@ApiModelProperty(value = "鍒濋獙鏀朵汉")
+	private String initialAcceptanceUser;
+	/**鍒濋獙鏀舵椂闂�*/
+	@ApiModelProperty(value = "鍒濋獙鏀舵椂闂�")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date initialAcceptanceTime;
+	/**鍒濋獙鏀舵剰瑙�*/
+	@ApiModelProperty(value = "鍒濋獙鏀舵剰瑙�")
+	private String initialAcceptanceComment;
+	/**鍒濋獙鏀堕檮浠�*/
+	@ApiModelProperty(value = "鍒濋獙鏀堕檮浠�")
+	private String initialAcceptanceFiles;
+	/**缁堥獙鏀朵汉*/
+	@ApiModelProperty(value = "缁堥獙鏀朵汉")
+	private String finalAcceptanceUser;
+	/**缁堥獙鏀舵椂闂�*/
+	@ApiModelProperty(value = "缁堥獙鏀舵椂闂�")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date finalAcceptanceTime;
+	/**缁堥獙鏀舵剰瑙�*/
+	@ApiModelProperty(value = "缁堥獙鏀舵剰瑙�")
+	private String finalAcceptanceComment;
+	/**缁堥獙鏀堕檮浠�*/
+	@ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
+	private String finalAcceptanceFiles;
 
 
 	//鍒楄〃灞曠ず

--
Gitblit v1.9.3