Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-14 add701dd94745e584871c519dd05557737bdea33

 server/src/main/java/doumeemes/dao/business/model/SalaryParam.java

@@ -11,6 +11,8 @@

import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -77,7 +79,7 @@

    @ApiModelProperty(value = "标准数量")
    @ExcelColumn(name="标准数量")
    private Integer num;
    private BigDecimal num;

    @ApiModelProperty(value = "标准时长（秒）")
    @ExcelColumn(name="标准时长（秒）")