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

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
public class ConditionDto {