Merge remote-tracking branch 'refs/remotes/origin/master' into test

# Conflicts:
#	config.js

config.js

@@ -3,9 +3,9 @@ const config = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
   //cloud后台网关地址
   // baseUrl: 'http://192.168.100.139:9527', //嵘哥
-  // baseUrl: 'http://192.168.100.128:9527',//龙哥
+  baseUrl: 'http://192.168.100.122:9527',//龙哥
   // baseUrl: 'http://192.168.100.122:9527',
-  baseUrl: 'https://goldshulin.com/prod-api',
+  // baseUrl: 'https://goldshulin.com/prod-api',
   mapKey: 'KFEBZ-P2GKZ-A5PX4-7Q6Y7-KXOBF-XCB4C',
   appName: '金邻助家',
   // 应用信息