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

jyy

2021-01-22 f6d898060ce3ab0bbca1924fad724858d4adc296

 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java

@@ -66,7 +66,7 @@
        }

        String userStr = redisClient.getCachedValue(token);
        redisClient.resetExpire(token);
//        redisClient.resetExpire(token);
        if (StringUtils.isBlank(userStr)) {
            ajaxResult.setInfo("login time out");
            response.getWriter().write(new ObjectMapper().writeValueAsString(ajaxResult));