Merge branch 'dev_New_pro' into dev_天津_宝东pro

云

2026-05-22 b97cf434154939778e71089b26efe5762cab80be

 src/main/java/com/ruoyi/approve/pojo/HolidaySettings.java

@@ -77,4 +77,7 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

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