Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java

@@ -68,6 +68,9 @@
    @Schema(description = "其他支出")
    private BigDecimal otherDeduct;

    @Schema(description = "社保补缴")
    private BigDecimal socialSupplementAmount;

    @Schema(description = "工资个税")
    private BigDecimal salaryTax;