Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

4 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

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