Merge branch 'jwdev' of http://192.168.1.220:10080/jiwei/wlyy2.0.config

# Conflicts:
#	application.yml

svr-base.yml

@@ -36,7 +36,7 @@ spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.19.103.77/jw2?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  zipkin: