From de02e2ab7f6b63ce92f712bf81de829c97289ca8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 15:50:23 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java |  177 ++++++----------------------------------------------------
 1 files changed, 20 insertions(+), 157 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 04b7896..131c9cc 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.List;
 
 /**
  * software_test_order
@@ -25,8 +26,6 @@
 	@ApiModelProperty(value = "椤圭洰ID")
 	private Long projectId;
 
-	@ApiModelProperty(value = "鏈烘瀯ID")
-	private Long agencyId;
 
 	@ApiModelProperty(value = "濮旀墭鍗曠紪鍙�")
 	private String code;
@@ -40,8 +39,11 @@
 	@ApiModelProperty(value = "娴嬭瘯渚濇嵁")
 	private String testBasis;
 
-	@ApiModelProperty(value = "娴嬭瘯绫诲瀷")
-	private String testType;
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1")
+	private String testType1;
+
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2")
+	private String testType2;
 
 	@ApiModelProperty(value = "娴嬭瘯鏍囧噯")
 	private String testStandard;
@@ -138,8 +140,8 @@
 	private String softwareName;
 
 	@TableField(exist = false)
-	@ApiModelProperty(value = "椤圭洰鏍囪瘑")
-	private String identity;
+	@ApiModelProperty(value = "杞欢鏍囪瘑")
+	private String softwareIdentity;
 
 	@TableField(exist = false)
 	@ApiModelProperty(value = "瀵嗙骇")
@@ -194,156 +196,17 @@
 	@ApiModelProperty(value = "鏄惁琚祴浠�")
 	private String isMeasured;
 
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�1鍒�")
+	List<String> testType11;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷1绗�2鍒�")
+	List<String> testType12;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�1鍒�")
+	List<String> testType21;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "娴嬭瘯绫诲瀷2绗�2鍒�")
+	List<String> testType22;
 
-	public String getEntrustUnitName() {
-		return entrustUnitName;
-	}
-
-	public void setEntrustUnitName(String entrustUnitName) {
-		this.entrustUnitName = entrustUnitName;
-	}
-
-	public String getEntrustUnitAddress() {
-		return entrustUnitAddress;
-	}
-
-	public void setEntrustUnitAddress(String entrustUnitAddress) {
-		this.entrustUnitAddress = entrustUnitAddress;
-	}
-
-	public String getEntrustUnitContact() {
-		return entrustUnitContact;
-	}
-
-	public void setEntrustUnitContact(String entrustUnitContact) {
-		this.entrustUnitContact = entrustUnitContact;
-	}
-
-	public String getEntrustUnitContWay() {
-		return entrustUnitContWay;
-	}
-
-	public void setEntrustUnitContWay(String entrustUnitContWay) {
-		this.entrustUnitContWay = entrustUnitContWay;
-	}
-
-	public String getDevelopUnitName() {
-		return developUnitName;
-	}
-
-	public void setDevelopUnitName(String developUnitName) {
-		this.developUnitName = developUnitName;
-	}
-
-	public String getDevelopUnitAddress() {
-		return developUnitAddress;
-	}
-
-	public void setDevelopUnitAddress(String developUnitAddress) {
-		this.developUnitAddress = developUnitAddress;
-	}
-
-	public String getDevelopUnitContact() {
-		return developUnitContact;
-	}
-
-	public void setDevelopUnitContact(String developUnitContact) {
-		this.developUnitContact = developUnitContact;
-	}
-
-	public String getDevelopUnitContWay() {
-		return developUnitContWay;
-	}
-
-	public void setDevelopUnitContWay(String developUnitContWay) {
-		this.developUnitContWay = developUnitContWay;
-	}
-
-	public String getSoftwareName() {
-		return softwareName;
-	}
-
-	public void setSoftwareName(String softwareName) {
-		this.softwareName = softwareName;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getIdentity() {
-		return identity;
-	}
-
-	public void setIdentity(String identity) {
-		this.identity = identity;
-	}
-
-	public Integer getSecretClass() {
-		return secretClass;
-	}
-
-	public void setSecretClass(Integer secretClass) {
-		this.secretClass = secretClass;
-	}
-
-	public Integer getCriticalLevel() {
-		return criticalLevel;
-	}
-
-	public void setCriticalLevel(Integer criticalLevel) {
-		this.criticalLevel = criticalLevel;
-	}
-
-	public Integer getTestLevel() {
-		return testLevel;
-	}
-
-	public void setTestLevel(Integer testLevel) {
-		this.testLevel = testLevel;
-	}
-
-	public String getSoftwareType() {
-		return softwareType;
-	}
-
-	public void setSoftwareType(String softwareType) {
-		this.softwareType = softwareType;
-	}
-
-	public String getProjectLeader() {
-		return projectLeader;
-	}
-
-	public void setProjectLeader(String projectLeader) {
-		this.projectLeader = projectLeader;
-	}
-
-	public String getProjectTesters() {
-		return projectTesters;
-	}
-
-	public void setProjectTesters(String projectTesters) {
-		this.projectTesters = projectTesters;
-	}
-
-	public String getProjectReviewer() {
-		return projectReviewer;
-	}
-
-	public void setProjectReviewer(String projectReviewer) {
-		this.projectReviewer = projectReviewer;
-	}
-
-	public Integer getIsContract() {
-		return isContract;
-	}
-
-	public void setIsContract(Integer isContract) {
-		this.isContract = isContract;
-	}
 }

--
Gitblit v1.9.1