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

云

2026-05-22 45444b9716d667597fceac6c271440cf2d10d661

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

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

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