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

.idea/vcs.xml

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
</project>

ag-admin.yml

@@ -3,6 +3,23 @@ logging:
    com:
      netflix: INFO
ribbon:
  ReadTimeout: 30000
  ConnectTimeout: 6000
zuul:
  ignored-services: "*"
  routes:
    svr-adaption: /api/v1.0/adapter/plan/adapterDataSet
hystrix:
  command:
    default:
      execution:
        isolation:
          thread:
            timeoutInMilliseconds: 30000
---
spring:
  profiles: dev