From b21945e7dea2daa8b30bee3cdd4bca91277e3b5f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 29 十一月 2023 09:22:17 +0800
Subject: [PATCH] 6

---
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/model/ItemCirculatOrder.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 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 e16ba9d..5c1a3e6 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
@@ -36,7 +36,10 @@
 	private String itemOther;
 
 	@ApiModelProperty(value = "鐗╁搧鎺ユ敹浜�")
-	private String itemAccept;
+	private String itemAcceptor;
+
+	@ApiModelProperty(value = "鐗╁搧鎺ユ敹浜篒D")
+	private String itemAcceptorId;
 
 	@ApiModelProperty(value = "鐗╁搧鎺ユ敹鏃堕棿")
 	@JsonFormat(pattern = "yyyy-MM-dd")
@@ -45,29 +48,37 @@
 	@ApiModelProperty(value = "鐗╁搧鎺ユ敹鎯呭喌璇存槑")
 	private String acceptSituation;
 
+	@ApiModelProperty(value = "鐥呮瘨搴撶増鏈�")
+	private String virusLibraryVersion;
+
 	@ApiModelProperty(value = "鏍″噯妫�娴嬩汉")
-	private String calibratDetect;
+	private String calibratDetector;
+
+	@ApiModelProperty(value = "鏍″噯妫�娴嬩汉ID")
+	private String calibratDetectorId;
 
 	@ApiModelProperty(value = "鏍″噯妫�娴嬫椂闂�")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date detectDate;
 
-
 	@ApiModelProperty(value = "鏍″噯妫�娴嬫儏鍐佃鏄�")
 	private String detectSituation;
 
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱浜�")
-	private String warehouse;
+/*	@ApiModelProperty(value = "鐗╁搧鍏ュ簱浜�")
+	private String warehousePerson;
 
 	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鏃堕棿")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date warehouseDate;
 
 	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鎯呭喌")
-	private String warehouseSituation;
+	private String warehouseSituation;*/
 
 	@ApiModelProperty(value = "鐗╁搧鍙戞斁浜�")
-	private String itemIssue;
+	private String itemIssuer;
+
+    @ApiModelProperty(value = "鐗╁搧鍙戞斁浜篒D")
+	private String itemIssuerId;
 
 	@ApiModelProperty(value = "鐗╁搧鍙戞斁鏃堕棿")
 	@JsonFormat(pattern = "yyyy-MM-dd")

--
Gitblit v1.9.1