Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 b248e201845e9704cf01f7ac723a64e2570039f4

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