From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突

---
 server/system_gateway/src/main/resources/bootstrap.yml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 099da4a..1375e72 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,11 +1,11 @@
 spring:
   profiles:
-    active: pro
+    active: dev
   application:
     name: system_gateway
   # 瀹夊叏閰嶇疆
-  security:
     # 楠岀鍏挜鍦板潃
+  security:
     oauth2:
       authorizationserver:
         token-uri: https://
\ No newline at end of file

--
Gitblit v1.9.3