From fe2f3011f3f5d3ea760b6520e9e95a2c419e4b78 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 11 十二月 2023 12:56:30 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index dfedc37..a8e8d9b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -27,7 +27,6 @@
 	@ApiModelProperty(value = "椤圭洰ID")
 	private Long projectId;
 
-
 	@ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
 	private String code;
 
@@ -40,6 +39,9 @@
 	@ApiModelProperty(value = "娴嬭瘯渚濇嵁")
 	private String testBasis;
 
+	@ApiModelProperty(value = "娴嬭瘯渚濇嵁鍏朵粬锛�")
+	private String otherBasis;
+
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1")
 	private String testType1;
 
@@ -48,6 +50,9 @@
 
 	@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
 	private String testStandard;
+
+	@ApiModelProperty(value = "娴嬭瘯鏍囧噯鍏朵粬")
+	private String otherStandard;
 
 	@ApiModelProperty(value = "寮�濮嬫棩鏈�")
 	@JsonFormat(pattern = "yyyy-MM-dd")
@@ -63,6 +68,9 @@
 	@ApiModelProperty(value = "鍏朵粬瑕佹眰")
 	private String otherRequire;
 
+	@ApiModelProperty(value = "鍏朵粬瑕佹眰鍏朵粬")
+	private String requireOther;
+
 	@ApiModelProperty(value = "娴嬭瘯鏃ユ湡")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date testDate;
@@ -76,6 +84,9 @@
 
 	@ApiModelProperty(value = "鐗╁搧鎬ц川")
 	private String articleNature;
+
+	@ApiModelProperty(value = "鐗╁搧鎬ц川鍏朵粬")
+	private String otherNature;
 
 	@ApiModelProperty(value = "鏍峰搧鐘舵��")
 	private String sampleStatus;
@@ -108,13 +119,15 @@
 	private String entrustSign;
 
 	@ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�")
-	private String entrustSignDate;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date entrustSignDate;
 
 	@ApiModelProperty(value = "鎵挎墭鏂圭瀛�")
 	private String contractSign;
 
 	@ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�")
-	private String contractSignDate;
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date contractSignDate;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О")
@@ -166,6 +179,9 @@
 
 	@ApiModelProperty(value = "娴嬭瘯绾у埆")
 	private Integer testLevel;
+
+	@ApiModelProperty(value = "骞翠唤")
+	private String year;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "杞欢绫诲瀷")
@@ -224,10 +240,6 @@
 	@TableField(exist = false)
 	@ApiModelProperty(value = "鍏抽敭绛夌骇瀛楃涓�")
 	String criticalLevelStr;
-
-	@TableField(exist = false)
-	@ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
-	String isMeasuredStr;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�")

--
Gitblit v1.9.1