From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
index 7065b79..bdb4a17 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -85,7 +85,7 @@
/**鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級*/
@Excel(name = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級", width = 15)
@ApiModelProperty(value = "鐘舵�侊紙1宸插垱寤猴紝2宸蹭笅鍙戯紝3鏈紑濮嬶紝4鎵ц涓紝5宸插畬鎴愶紝6宸茶繃鏈燂紝7宸蹭綔搴燂級")
- private String status = CommonConstant.STATUS_1;
+ private String status;
/**澶囩敤瀛楁1*/
@Excel(name = "澶囩敤瀛楁1", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁1")
@@ -117,6 +117,11 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "淇濆吇鏃ユ湡")
+ private Date maintenanceDate;
+
@ApiModelProperty(value = "浜屼繚绉讳氦鍗曠‘璁ょ姸鎬侊紙0鏈‘璁わ紝1鎿嶄綔鍛樼‘璁わ紝2椹冲洖鎿嶄綔鍛橈紝3缁翠慨纭锛�4椹冲洖缁翠慨鍛橈紝5缁翠慨瀹や富浠荤‘璁わ紝6椹冲洖缁翠慨瀹や富浠伙紝7璁惧妫�楠屽憳纭锛�")
private String confirmStatus;
--
Gitblit v1.9.3