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

svr-app.yml

@@ -31,9 +31,9 @@ spring:
  profiles: test
data-source:
  url: jdbc:mysql://192.168.1.220:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: ha
  password: ha
  url: jdbc:mysql://172.19.103.50:3306/healtharchive?useUnicode=true&characterEncoding=UTF-8
  user-name: yuhaihua
  password: yuhaihua
hibernate:
  hibernate-properties:

svr-user.yml

@@ -39,6 +39,7 @@ data-source:
  user-name: yuhaihua
  password: yuhaihua
hibernate:
  hibernate-properties:
    hibernate: