Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java...

huliguo

3 天以前 7a74745bad7ff20df9e170433c1e1cb851ce7fa9

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

@@ -21,7 +21,6 @@
#        server-addr: 47.109.78.184:5000
#        server-addr: 127.0.0.1:8848
        server-addr: 192.168.110.80:8848
        ip: 192.168.110.21
        #pro
#        namespace: 9591ef9f-a49a-4900-be35-d77258bdd639
        #test