Merge branch 'Jw' into 'master'

修改mq配置 2:完善客服模块订单处理逻辑 (待完善)"

See merge request hewei/Jumeirah!85

config/src/main/resources/config/application-dev.yml

@@ -21,8 +21,8 @@ spring:
   # Redis配置
   # Redis配置
   redis:
   redis:
     database: 0
     database: 0
-    host: localhost
-    password: 123456
+    host: 47.99.47.225
+    password: temple123456
     port: 6379
     port: 6379
 
 
   rabbitmq:
   rabbitmq: