From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java | 14 ++++++++++----
1 files changed, 10 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 752f8f7..805edcf 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,12 +13,21 @@
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 TestAgencyInfo TestAgencyInfo;
+ @ApiModelProperty(value = "闄勪欢")
+ private OssDto files;
+
@ApiModelProperty(value = "琚祴浠�")
private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
@ApiModelProperty(value = "浜や粯浠�")
private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>();
+
}
--
Gitblit v1.9.1