Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2026-04-25 48c6db93631b1916f9bb0f70f82fda2b50ecdc43

 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()

    {

@@ -159,6 +161,11 @@
    public String getUsername()

    {

        return user.getUserName();

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

@@ -309,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;
    }
}