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

liyong

20 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */