Merge branch 'pim_bhz' into pim_ywx

buhuazhen

3 天以前 93723438fd269d2f602439eabca127ed4054818a

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

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

    }



    public String getNickName()

    {

        return user.getNickName();

    }



    /**

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

     */