Merge remote-tracking branch 'origin/master'

无关风月

昨天 02bb94e413f6950b9786c5ee86c0937bc20f8ae8

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

@@ -45,7 +45,9 @@
    @TableField("status")
    private Integer status;

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

    @TableField(exist = false)
    private List<TProjectDept> children;
    @ApiModelProperty("部门人数")
    @TableField(exist = false)
    private Integer userCount;
}