Merge branch 'dev_New_pro' into dev_天津_中兴实强

云

2026-05-25 974b553211485da3634f8ff0e3ecb1eb61881e2d

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

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

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