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

云

2026-04-20 2cf0b0d03d285fb86c232703510cd80cceb6e186

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

@@ -90,4 +90,7 @@
    @ApiModelProperty("修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}