From 4936ba718f4ec2d069a9c28d07215573ed8548aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 10:12:10 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 5 -----
1 files changed, 0 insertions(+), 5 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 bbebe43..552af91 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -14,13 +14,8 @@
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: dm_visits_test
->>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d
# namespace: dev_renkang
username: nacos
password: nacos
--
Gitblit v1.9.3