Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

10 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

 src/main/java/com/ruoyi/framework/security/LoginUser.java

@@ -79,7 +79,9 @@
    /**

     * 当前部门id

     */

    private Long currentDeptId;

    private Long currentDeptId;

    private String dataScope;


    public LoginUser()

    {

@@ -314,7 +316,15 @@
        return currentDeptId;

    }



    public void setCurrentDeptId(Long currentDeptId) {

        this.currentDeptId = currentDeptId;

    }

}

    public void setCurrentDeptId(Long currentDeptId) {
        this.currentDeptId = currentDeptId;
    }

    public String getDataScope() {
        return dataScope;
    }

    public void setDataScope(String dataScope) {
        this.dataScope = dataScope;
    }
}