Merge branch 'pim_ywx'

yaowanxin

6 天以前 b33e6f53dd537abaebad066de12474580fcc33b2

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

@@ -161,6 +161,11 @@
        return user.getUserName();

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

     * 账户是否未过期,过期无法验证

     */