Merge branch 'dev' of wangzhinan/wlyy2.0 into dev

svr/svr-wlyy-health-bank/src/main/resources/application.yml

@@ -80,9 +80,9 @@ fastDFS:
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
    url: jdbc:mysql://172.17.110.160:3306/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名