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/dto/SoftwareTestOrderDto.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
index 466f9b8..527ef61 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
@@ -1,9 +1,6 @@
package com.zt.life.modules.project.dto;
-import com.zt.life.modules.project.model.Project;
-import com.zt.life.modules.project.model.SoftwareTestOrder;
-import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
-import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
+import com.zt.life.modules.project.model.*;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.sys.dto.OssDto;
import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +13,14 @@
public class SoftwareTestOrderDto {
private Long id;
private Long projectId;
+ private Long orderId;
@ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曡褰�")
private SoftwareTestOrder softwareTestOrder;
@ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
private Project project;
+ @ApiModelProperty(value = "娴嬭瘯鐜寤虹珛纭")
+ private Environ environ;
@ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
@ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曢檮浠�")
@@ -30,5 +30,12 @@
private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
@ApiModelProperty(value = "浜や粯浠�")
private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>();
+ @ApiModelProperty(value = "杞欢璧勬簮")
+ private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>();
+ @ApiModelProperty(value = "纭欢璧勬簮")
+ private List<EnvironHardwareResources> hardwareResourcesList = new ArrayList<>();
+ @ApiModelProperty(value = "鐜宸紓鎬у垎鏋�")
+ private List<EnvironAnalysis> environAnalysisList = new ArrayList<>();
+
}
--
Gitblit v1.9.1