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

huliguo

1 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

 ruoyi-modules/ruoyi-shop/src/main/resources/bootstrap.yml

@@ -15,7 +15,6 @@
      discovery:
        # 服务注册地址
        server-addr: 192.168.110.80:8848
        ip: 192.168.110.21
#        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
#        pro