From 2c89ccdc9e008060f8cd6608c9fcb014616987a3 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 10:27:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 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 d093085..f7803b0 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
@@ -10,6 +10,7 @@
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -39,10 +40,10 @@
 	@ApiModelProperty(value = "娴嬭瘯渚濇嵁")
 	private String testBasis;
 
-	@ApiModelProperty(value = "娴嬭瘯绫诲瀷")
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1")
 	private String testType1;
 
-	@ApiModelProperty(value = "娴嬭瘯绫诲瀷")
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2")
 	private String testType2;
 
 	@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
@@ -103,6 +104,18 @@
 	@ApiModelProperty(value = "浼犵湡")
 	private String fax;
 
+	@ApiModelProperty(value = "濮旀墭鏂圭瀛�")
+	private String entrustSign;
+
+	@ApiModelProperty(value = "濮旀墭鏂圭瀛楁棩鏈�")
+	private String entrustSignDate;
+
+	@ApiModelProperty(value = "鎵挎墭鏂圭瀛�")
+	private String contractSign;
+
+	@ApiModelProperty(value = "鎵挎墭鏂圭瀛楁棩鏈�")
+	private String contractSignDate;
+
 	@TableField(exist = false)
 	@ApiModelProperty(value = "濮旀墭鍗曚綅鍚嶇О")
 	private String entrustUnitName;
@@ -151,7 +164,6 @@
 	@ApiModelProperty(value = "鍏抽敭绛夌骇")
 	private Integer criticalLevel;
 
-	@TableField(exist = false)
 	@ApiModelProperty(value = "娴嬭瘯绾у埆")
 	private Integer testLevel;
 
@@ -198,15 +210,46 @@
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�1鍒�")
-	List<String> testType11;
+	List<HashMap<String, Object>> testType11;
 	@TableField(exist = false)
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�2鍒�")
-	List<String> testType12;
+	List<HashMap<String, Object>> testType12;
 	@TableField(exist = false)
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�1鍒�")
-	List<String> testType21;
+	List<HashMap<String, Object>> testType21;
 	@TableField(exist = false)
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�2鍒�")
-	List<String> testType22;
+	List<HashMap<String, Object>> testType22;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鍏抽敭绛夌骇瀛楃涓�")
+	String criticalLevelStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�")
+	String sortwareTypeStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯渚濇嵁瀛楃涓�")
+	String testBasisStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯鐩稿叧鏍囧噯瀛楃涓�")
+	String testStandardStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯绾у埆瀛楃涓�")
+	String testLevelStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鍏朵粬瑕佹眰瀛楃涓�")
+	String otherRequireStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鐗╁搧鎬ц川瀛楃涓�")
+	String articleNatureStr;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏍峰搧鐘舵�佸瓧绗︿覆")
+	String sampleStatusStr;
 }

--
Gitblit v1.9.1