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

zss

8 天以前 3e5315bf1913ec325697f22104fcd2758c98891a

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