From 9025b9cf7ec8610003d445a31d93e35e7bd73c2e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 31 一月 2024 17:54:52 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java |   52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 42 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..26d1835 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
@@ -51,6 +51,32 @@
 	@ApiModelProperty(value = "鐥呮瘨搴撶増鏈�")
 	private String virusLibraryVersion;
 
+	@ApiModelProperty(value = "妫�娴嬫帴鏀朵汉")
+	private String detectAcceptor;
+
+	@ApiModelProperty(value = "妫�娴嬫帴鏀朵汉ID")
+	private String detectAcceptorId;
+
+	@ApiModelProperty(value = "妫�娴嬫帴鏀舵椂闂�")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date detectAcceptDate;
+
+	@ApiModelProperty(value = "妫�娴嬫帴鏀舵儏鍐佃鏄�")
+	private String detectAcceptSituation;
+
+	@ApiModelProperty(value = "鍏ュ簱浜�")
+	private String depositor;
+
+	@ApiModelProperty(value = "鍏ュ簱浜篒D")
+	private String depositorId;
+
+	@ApiModelProperty(value = "鍏ュ簱鏃堕棿")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date depositDate;
+
+	@ApiModelProperty(value = "鍏ュ簱鎯呭喌璇存槑")
+	private String depositSituation;
+
 	@ApiModelProperty(value = "鏍″噯妫�娴嬩汉")
 	private String calibratDetector;
 
@@ -63,16 +89,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 +117,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