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

zss

7 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

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