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

Conflicts:
	svr-pack-resolve.yml

svr-ehr-basic.yml

@@ -121,6 +121,12 @@ spring:
    url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8&useSSL=false
    username: weifuwu
    password: weifuwu
  ldap:
    host: 172.19.103.87
    port: 389
    bindDn: cn=admin,dc=ehr,dc=jkzl
    password: jkzl
    root: dc=ehr,dc=jkzl
  data:
    mongodb:
      host: 192.168.1.220