Merge remote-tracking branch 'origin/master'

jinlin

2023-11-15 43094c8793de5af81904eb49eebacfb76e209fe3

 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java

@@ -19,9 +19,10 @@
    private SoftwareTestOrder softwareTestOrder;
    private Project project;
    private TestAgencyInfo TestAgencyInfo;

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