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

liyong

4 天以前 700e40694345fec652d7dca688912c36af18e1ae

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