From 1249ac088787abb46bc60a241531e2b4fcc961fe Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 13 十一月 2023 10:38:57 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 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 85cb239..04ffe2f 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
@@ -25,6 +25,10 @@
 	@ApiModelProperty(value = "椤圭洰ID")
 	private Long projectId;
 
+
+	@ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
+	private String code;
+
 	@ApiModelProperty(value = "杩愯鐜")
 	private String optEnviron;
 
@@ -35,7 +39,10 @@
 	private String testBasis;
 
 	@ApiModelProperty(value = "娴嬭瘯绫诲瀷")
-	private String testType;
+	private String testType1;
+
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷")
+	private String testType2;
 
 	@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
 	private String testStandard;
@@ -132,10 +139,6 @@
 	private String softwareName;
 
 	@TableField(exist = false)
-	@ApiModelProperty(value = "椤圭洰缂栧彿")
-	private String code;
-
-	@TableField(exist = false)
 	@ApiModelProperty(value = "椤圭洰鏍囪瘑")
 	private String identity;
 
@@ -171,6 +174,29 @@
 	@ApiModelProperty(value = "鏄惁绛剧讲鍚堝悓")
 	private Integer isContract;
 
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "搴忓彿")
+	private Integer num;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "濮旀墭鍗旾D")
+	private Long orderId;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鍚嶇О")
+	private String name;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
+	private String identify;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "鏄惁琚祴浠�")
+	private String isMeasured;
+
+
+
 	public String getEntrustUnitName() {
 		return entrustUnitName;
 	}

--
Gitblit v1.9.1