Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -95,7 +95,7 @@ global:
       /adam/login/sms,
       /adam/login/mobile,
       /adam/login/tpa,
-      /adam/send
+      /adam/send,
       /adam/member/info
     url-pattern: /kylin/**
 # -----------------------------------------------------------