From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
index 5c1a3e6..9c0c365 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java
@@ -64,16 +64,6 @@
 	@ApiModelProperty(value = "鏍″噯妫�娴嬫儏鍐佃鏄�")
 	private String detectSituation;
 
-/*	@ApiModelProperty(value = "鐗╁搧鍏ュ簱浜�")
-	private String warehousePerson;
-
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鏃堕棿")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date warehouseDate;
-
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鎯呭喌")
-	private String warehouseSituation;*/
-
 	@ApiModelProperty(value = "鐗╁搧鍙戞斁浜�")
 	private String itemIssuer;
 
@@ -101,5 +91,21 @@
 	@ApiModelProperty(value = "鐗╁搧缂栧彿")
 	private String softwareIdentity;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鍏朵粬瑕佹眰")
+	private String itemRequireStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鐗╁搧鎺ユ敹鎯呭喌璇存槑")
+	private String acceptSituationStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏍″噯妫�娴嬫儏鍐佃鏄�")
+	private String detectSituationStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鐗╁搧鍙戞斁鎯呭喌璇存槑")
+	private String issueSituationStr;
+
 
 }

--
Gitblit v1.9.1