Merge remote-tracking branch 'origin/dev_member_voucher_refund' into dev-social

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
#	liquidnet-bus-api/pom.xml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
#	liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DMCheckOrderTimeImpl.java
#	liquidnet-bus-service/pom.xml

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -61,6 +61,7 @@ liquidnet:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
+      url: http://testkylin.zhengzai.tv/kylin
     order:
       adam:
         url: http://devadam.zhengzai.tv/adam
@@ -134,6 +135,14 @@ liquidnet:
     android:
       appkey: 5c6cf6cbb465f592e4000bae
       appMasterSecret: dmsho74wlpd1hp7vrwp9bjehzwo29pza
+  shumei:
+    url:
+  easemob:
+    api-url: https://a1.easemob.com
+    org-name: 1106210901175651
+    app-name: demo
+    client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
+    client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
 
 
 #application-dev-end

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -61,6 +61,7 @@ liquidnet:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
         localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
+      url: http://testkylin.zhengzai.tv/kylin
     candy:
       url: http://testcandy.zhengzai.tv/candy
     order:
@@ -134,6 +135,14 @@ liquidnet:
     android:
       appkey: 5c6cf6cbb465f592e4000bae
       appMasterSecret: dmsho74wlpd1hp7vrwp9bjehzwo29pza
+  shumei:
+    url:
+  easemob:
+    api-url: https://a1.easemob.com
+    org-name: 1106210901175651
+    app-name: demo
+    client-id: YXA6x4Xs7cYDQcOv6BPuM3hUDA
+    client-secret: YXA6olr2qaW65xlkFixS81kiWnplrW4
 
 
 #application-test-end