Merge branch 'jtwy' into dev_New

zss

17 小时以前 2757f1d46f388f684aad93b3dc7ad805c45c6248

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */