Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

3 天以前 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381

 server/visits/admin_timer/src/main/resources/bootstrap-pro.yml

@@ -23,7 +23,7 @@
      #        data-id: com.doumee.meeting.admin
      discovery:
        server-addr: http://localhost:8848 #配置Nacos地址
        namespace: wuhuyancao
        namespace: maanshanyancao
        username: nacos
        password: nacos