Merge remote-tracking branch 'origin/master'

xyc

2024-09-13 dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dto/ConditionDto.java

@@ -11,7 +11,7 @@
    private String tjlx;
    private Double specifiedValue;
    private Double minAccepValue;
    private BigDecimal productionRisk;
    private BigDecimal userRisk;
    private Double productionRisk;
    private Double userRisk;
    private Integer showFailureTime;
}