Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 f84e186541e7991147d2b09d1b10247d281c2996

 ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectDept.java

@@ -47,5 +47,7 @@

    @TableField(exist = false)
    private List<TProjectDept> children;

    @ApiModelProperty("部门人数")
    @TableField(exist = false)
    private Integer userCount;
}