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

rk

21 小时以前 c174ab473487cbf92f382197f84e05ed22de258a

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

@@ -6,7 +6,7 @@
      password: nacos
      discovery:
        server-addr: http://localhost:8848 #配置Nacos地址
        namespace: wuhuyancao
        namespace: maanshanyancao
#        namespace: dev_renkang
        username: nacos
        password: nacos