Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-server-oauth

src/main/resources/test/bootstrap.yml

@@ -13,8 +13,8 @@ spring:
   datasource:
     driver-class-name: org.postgresql.Driver
     url: jdbc:postgresql://s.dev01.dkiboss.com:15000/dkmes3?currentSchema=core
-    username: dkmes
-    password: dongkemes
+    username: mes_dev
+    password: dk
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 10 # 初始化时建立物理连接的个数。初始化发生在显示调用init方法，或者第一次getConnection时