Merge branch 'dev_New_pro' into dev_克拉玛依市新聚工贸_pro

云

2026-08-26 b2da163832b4e665645d39a5ec3ece7209d75143

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