Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-11 2c9b203b574069ada650fd9e53115ed665adbc24

 screen-common/src/main/java/com/moral/util/TokenUtils.java

@@ -120,7 +120,7 @@
        return userInfo;
    }

    public static Object getUserInfoByToken() {
    public static Object getUserInfo() {
        String token = getCurrentToken();
        return getUserInfoByToken(token);
    }