Merge remote-tracking branch 'origin/master'

zzw

2023-11-17 ce06cb3e8167151290d68b76b3684ec49e8f31a4

 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<>();
}