Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

yuan

10 天以前 128477234dfccf2b06b608b5569595607d9752cf

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