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

云

2026-04-28 a7dd93b840bdce4bd0011bc948157f440514a207

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

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

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