qw

2019-09-24 10:13:36 +08:00
parent 2a90014ac1
commit 3b9805e47d
4 changed files with 6 additions and 7 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,11 +23,8 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
-=======
  baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
->>>>>>> f8c7e9afc36e00f5106add1477d9f258dbe37ec6
  timeout: 1500000 // 请求超时时间
 })