Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044

 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="合格率(%)" ,suffix="%")
    private BigDecimal rate;

}