Merge branch 'zx_redis_conf' of http://git.dayaedu.com/yonge/cooleshow into develop-new

pom.xml

@@ -21,7 +21,7 @@
 		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 		<zipkin.version>2.12.2</zipkin.version>
 		<google.zxing.version>3.4.0</google.zxing.version>
-		<redisson.version>3.16.4</redisson.version>
+		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
 	</properties>