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

buhuazhen

6 天以前 5ddc232b8dffcb3402711874491df35fb1997d1d

 src/main/java/com/ruoyi/oA/pojo/OaProject.java

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


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