Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2 天以前 372d212912401059defe5fe83379c50d1033c06e

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