12

2020-01-11 16:48:40 +08:00
parent 643426ea1c 4fb54f4d3e
commit abc24b9120
2 changed files with 6 additions and 1 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,8 +26,12 @@ 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.100:8074/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+>>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821
  timeout: 1500000 // 请求超时时间
 })
 export default service