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 |   80 +++++++++++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 13 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 462b976..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
@@ -1,5 +1,6 @@
 package com.zt.life.modules.itemCirculatOrder.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zt.common.entity.BusiEntity;
@@ -35,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")
@@ -44,8 +48,40 @@
 	@ApiModelProperty(value = "鐗╁搧鎺ユ敹鎯呭喌璇存槑")
 	private String acceptSituation;
 
+	@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 calibratDetect;
+	private String calibratDetector;
+
+	@ApiModelProperty(value = "鏍″噯妫�娴嬩汉ID")
+	private String calibratDetectorId;
 
 	@ApiModelProperty(value = "鏍″噯妫�娴嬫椂闂�")
 	@JsonFormat(pattern = "yyyy-MM-dd")
@@ -54,18 +90,11 @@
 	@ApiModelProperty(value = "鏍″噯妫�娴嬫儏鍐佃鏄�")
 	private String detectSituation;
 
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱浜�")
-	private String warehouse;
-
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鏃堕棿")
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date warehouseDate;
-
-	@ApiModelProperty(value = "鐗╁搧鍏ュ簱鎯呭喌")
-	private String warehouseSituation;
-
 	@ApiModelProperty(value = "鐗╁搧鍙戞斁浜�")
-	private String itemIssue;
+	private String itemIssuer;
+
+    @ApiModelProperty(value = "鐗╁搧鍙戞斁浜篒D")
+	private String itemIssuerId;
 
 	@ApiModelProperty(value = "鐗╁搧鍙戞斁鏃堕棿")
 	@JsonFormat(pattern = "yyyy-MM-dd")
@@ -80,4 +109,29 @@
 	@ApiModelProperty(value = "骞翠唤")
 	private String year;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鐗╁搧鍚嶇О")
+	private String softwareName;
+
+	@TableField(exist = false)
+	@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