he2802 3 年之前
父節點
當前提交
8c8f42b0e9
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      common/request.js

+ 1 - 4
common/request.js

@@ -4,11 +4,8 @@
 import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
-<<<<<<< HEAD
 export const BASE_URL = 'http://42.192.164.187:19005'//接口api  http://42.192.164.187:19005
-=======
-export const BASE_URL = 'http://42.192.164.187:19005'//接口api
->>>>>>> feature-mycourse
+
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'//图片上传api  'https://file.xyyxt.net/
 export const tenantId = '867735392558919680'
 export const myRequest = (options) => {