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

gongchunyi

8 天以前 bbd9823e935293b4815963647fecf48e3ba7ee1b

 src/main/java/com/ruoyi/approve/pojo/AnnualLeaveSetting.java

@@ -67,4 +67,7 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}