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

hos-admin.yml

@@ -62,7 +62,7 @@ spring:
      INDENT_OUTPUT: true
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://172.19.103.42:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      url: jdbc:mysql://172.19.103.57:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: 123456
      test-on-borrow: true
@@ -92,3 +92,8 @@ spring:
    proxy-target-class: true
hos:
  saasAdmin: jkzl  #SAAS管理员账号,暂时配置在此处
jwt:
  header: Authorization
  secret: mySecret
  expiration: 604800
  tokenHead: "Bearer "