Merge branch 'dev' of lyr/ehr.config into dev

svr-health-profile.yml

@@ -128,8 +128,8 @@ hadoop:
    - hbase.zookeeper.quorum: node2.jkzldev.com,node1.jkzldev.com,node4.jkzldev.com
fast-dfs:
  tracker-server: 172.19.103.13:22122
  public-server: http://172.19.103.52:80
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80
---
spring: