Merge branch 'dev' of http://192.168.1.220:10080/EHR/ehr.config into dev

ag-admin.yml

@@ -8,9 +8,10 @@ ribbon:
  ConnectTimeout: 6000
zuul:
  ignored-services: "*"
  routes:
    svr-adaption: /api/v1.0/adapter/plan/adapterDataSet
    adapterDataSet:
      path: /api/v1.0/adapter/plan/adapterDataSet
      serviceId: svr-adaption
hystrix:
  command: