Merge remote-tracking branch 'origin/sqd' into sqd

yaowanxin

3 天以前 93ccb6e153b5523a46738bbf6713cd4df25a49e4

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */