Merge remote-tracking branch 'origin/dev_鹤壁_强信宇_pro' into dev_pro_河南鹤壁

yuan

2026-05-14 86089ed4cb7c294cda676947f5fc672c9561e4b3

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