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

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 e86710d..466f9b8 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
@@ -16,12 +16,19 @@
 public class SoftwareTestOrderDto {
     private Long id;
     private Long projectId;
+
+    @ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曡褰�")
     private SoftwareTestOrder softwareTestOrder;
+    @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
     private Project project;
+    @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
     private TestAgencyInfo TestAgencyInfo;
+    @ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曢檮浠�")
+    private OssDto files;
+
     @ApiModelProperty(value = "琚祴浠�")
-    private List<SoftwareTestOrderMeasured> softwareTestOrderMeasuredList = new ArrayList<>();
+    private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
     @ApiModelProperty(value = "浜や粯浠�")
-    private List<SoftwareTestOrderDeliverable> softwareTestOrderDeliverableList = new ArrayList<>();
+    private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>();
 }
 

--
Gitblit v1.9.1