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

zss

2026-04-30 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 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;
}