From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 safePlatfrom-out-web/src/main/resources/config/application.yaml |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index ed41ebd..772fabb 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -1,12 +1,9 @@
 spring:
   application:
-    name: gkhy-safeplatform-out
+    name: safeplatform-out
   profiles:
-#    active: prod
-    active: out-dev
-
-#mybatis-plus:
-#  mapper-locations: classpath:config/mapper/**/*.xml
+#    active: test
+    active: guotai-demo
 
 logging:
   config: classpath:config/log/log4j2.xml

--
Gitblit v1.9.2