Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-17 abd93f604df5251bf993ac483978e8fb084071db

 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;

}