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

doum

11 小时以前 48d2fcc6e04d9fdf61e079d427186338a1816dba

 server/system_timer/src/main/resources/bootstrap-pro.yml

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