Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

Mr.Shi

2023-08-16 d044dc871c16f05c9a1fb1489621020c91ec9d59

 server/src/main/java/doumeemes/dao/ext/vo/UserSalaryListVO.java

@@ -66,7 +66,7 @@
    @ExcelColumn(name="不良品数")
    private BigDecimal unQualifiedNum;
    @ApiModelProperty(value = "合格率（%）")
    @ExcelColumn(name="合格率")
    @ExcelColumn(name="合格率(%)")
    private BigDecimal rate;

}