From dc1d63d044e66337f1cce699f2192a5e25ea206b Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 14 九月 2023 10:30:18 +0800
Subject: [PATCH] 羚羊和生产环境隔离

---
 server/src/main/resources/application.yml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 954b731..3d9a01d 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -7,9 +7,13 @@
 
 spring:
 #  application:
-#    name: doumeemes
+#  name: doumeemes
   profiles:
-    active: standard
+<<<<<<< HEAD
+    active: standardTest
+=======
+    active: standardLingyang
+>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
   # JSON杩斿洖閰嶇疆
   jackson:
     # 榛樿鏃跺尯

--
Gitblit v1.9.3