merge

learnOnline/utils/util.js

@@ -20,13 +20,10 @@ const url_online = {
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'collage',
   version: '3.0.8'
-<<<<<<< HEAD
 };
-let config = url_online;
-=======
-}
+
 let config = url_test;
->>>>>>> master
+
 /* 请求接口统一 重定义 */
 const requestApi = (obj) => {
   let _token = wx.getStorageSync('userSession').sessionKey;