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

zss

8 天以前 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9

 src/main/java/com/ruoyi/project/system/domain/SysDept.java

@@ -55,6 +55,9 @@
    /** 部门编号 */

    private String deptNick;

    

    /** 员工数量 */

    private Integer staffCount;

    
    /** 子部门 */

    private List<SysDept> children = new ArrayList<SysDept>();



@@ -192,6 +195,14 @@
        this.deptNick = deptNick;

    }



    public Integer getStaffCount() {

        return staffCount;

    }



    public void setStaffCount(Integer staffCount) {

        this.staffCount = staffCount;

    }



    @Override

    public String toString() {

        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@@ -199,6 +210,7 @@
            .append("parentId", getParentId())

            .append("ancestors", getAncestors())

            .append("deptName", getDeptName())

            .append("staffCount", getStaffCount())

            .append("orderNum", getOrderNum())

            .append("leader", getLeader())

            .append("phone", getPhone())