Merge branch 'dev_New' into dev_New_kthg

zss

9 天以前 d5dc454e86e78abd6ca859bb9b0a4c096d743b3b

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */