From d40c3ccad0e5264fefd33264254564dead8c80df Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 06 十一月 2023 11:44:36 +0800
Subject: [PATCH] 单据名称增加单据来源

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 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 9b360d6..93b92a4 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
@@ -94,17 +94,17 @@
 	@Excel(name = "澶囩敤瀛楁2", width = 15)
     @ApiModelProperty(value = "澶囩敤瀛楁2")
     private String maintenanceOrderUda2;
-	/**澶囩敤瀛楁3*/
-	@Excel(name = "澶囩敤瀛楁3", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁3")
+	/**浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d*/
+	@Excel(name = "浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d", width = 15)
+    @ApiModelProperty(value = "浜岀骇淇濆吇瀹屽伐绉讳氦鍗曞崟鎹紪鐮乮d")
     private String maintenanceOrderUda3;
 	/**澶囩敤瀛楁4*/
-	@Excel(name = "澶囩敤瀛楁4", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁4")
+	@Excel(name = "涓夌骇淇濆吇绮惧害妫�楠屽崟鍗曟嵁缂栫爜id", width = 15)
+    @ApiModelProperty(value = "涓夌骇淇濆吇绮惧害妫�楠屽崟鍗曟嵁缂栫爜id")
     private String maintenanceOrderUda4;
-	/**澶囩敤瀛楁5*/
-	@Excel(name = "澶囩敤瀛楁5", width = 15)
-    @ApiModelProperty(value = "澶囩敤瀛楁5")
+	/**涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d*/
+	@Excel(name = "涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d", width = 15)
+    @ApiModelProperty(value = "涓夌骇淇濆吇楠屾敹鍗曞崟鎹紪鐮乮d")
     private String maintenanceOrderUda5;
 	/**鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�*/
 	@Excel(name = "鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�", width = 15)
@@ -126,8 +126,23 @@
     @ApiModelProperty(value = "闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�")
     private String description;
 
+    @ApiModelProperty(value = "鐐夌被璁惧璞佸厤20椤圭姸鎬侊紙0鏈‘璁わ紝1缁翠慨瀹や富浠伙紝2淇濆吇浜哄憳锛�3浠〃宸ワ級")
     private String stoveExemptStatus;
 
+    @ApiModelProperty(value = "3淇濋獙鏀跺崟妫�鏌ヤ汉鍛�")
+    private String inspectUser;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "3淇濋獙鏀跺崟妫�鏌ユ椂闂�")
+    private Date inspectDate;
+
+    @ApiModelProperty(value = "3淇濋獙鏀舵湭閫氳繃鍘熷洜")
+    private String notPassReason;
+
+    @ApiModelProperty(value = "涓夌骇淇濆吇楠屾敹鐘舵�侊紙1閫氳繃锛�2鏈�氳繃锛�")
+    private String checkStatus;
+
     @TableField(exist = false)
     private List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails;
 }

--
Gitblit v1.9.3