From 3a154bdb0a5aaa2c0ac3eac95a6ba747068bd454 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 10:00:37 +0800
Subject: [PATCH] 优化
---
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index 14830a4..bbebe43 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -14,8 +14,13 @@
username: nacos
password: nacos
config:
+<<<<<<< HEAD
+ server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ namespace: dev_renkang
+=======
server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
- namespace: wuhu_visit_dev
+ namespace: dm_visits_test
+>>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
# namespace: dev_renkang
username: nacos
password: nacos
@@ -25,7 +30,7 @@
discovery:
server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
- namespace: dmvisit
+ namespace: dev_renkang
username: nacos
password: nacos
# 瀹夊叏閰嶇疆
--
Gitblit v1.9.3