Merge branch 'master' of http://47.92.161.104:10080/yanliming/making_friends-portal

.env.test

@@ -1,7 +1,7 @@
 OUT_PUT_DIR=dist/jz-making_friends-server
 
 #VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jz-making_friends-server/
+VUE_APP_BACKEND_URL=https://charging.xiaoxinda.com/making-friends-server
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=https://ykt-test.xiaoxinda.com/jz-making_friends-server/healthPublicity