Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSyst...

郑永安

2023-07-24 0f9aa9c4d8802d027010f39c391897f32a8de6bb

Merge branch 'master' of
https://sinanoaq.cn:8888/r/hazardInvestigationSystem.git

Conflicts:
	src/main/resources/application-dev.yml

 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