Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

 fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java

@@ -113,6 +113,9 @@
                              out.print(JsonUtil.loadFalseResult("连接超时"));

                              return null;

                           }

                        } else {

                           // 设置30秒处理时间

                           jedis.expire(cacheKey, 30);

                        }

                     }