Merge remote-tracking branch 'origin/master'

k94314517

2023-08-18 0eb8b0635a2e50ff1f82bbea890804e73aae59af

 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;

}