From 0f9aa9c4d8802d027010f39c391897f32a8de6bb Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 24 七月 2023 09:57:31 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

---
 src/main/resources/application-dev.yml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 14f72fe..ff33d53 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -116,8 +116,7 @@
       url:
 
 rocketmq:
-  name-server: 192.168.0.52:9876
-  #name-server: localhost:9876
+  name-server: 192.168.30.107:9876
   producer: 
     group: gkhy-safeplatform-dev-ZIS
     sendMessageTimeout: 300000
@@ -137,3 +136,5 @@
     preventWaitWorkTopic: gkhy-safeplatform-topic-preventWaitWork-ZIS
     applySpecialWorkTopic: gkhy-safeplatform-topic-applySpecialWork-ZIS
     approvalSpecialWorkTopic: gkhy-safeplatform-topic-approvalSpecialWork-ZIS
+=======
+>>>>>>> branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

--
Gitblit v1.9.2