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

zss

9 天以前 d406310fa4d79e99b825a3698ee60af2991c261c

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