Merge branch 'jtwy' into dev_New

zss

9 天以前 d972907df11fa76d5766e9aed7f0d36488310d99

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */