Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 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);
    }