Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

2023-05-05 18:23:40 +08:00
parent 1c327b5e58 eb2653f67d
commit 4ed462645b
4 changed files with 286 additions and 269 deletions
--- a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml
@@ -1,9 +1,5 @@
 server:
  port: 8010
-#配置数据源
-spring:
-  profiles:
-    test
  datasource:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource