样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,11 +23,7 @@ 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://123.56.95.229:8023/submit/MESCommonBase.ashx`,
-=======
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  timeout: 1500000 // 请求超时时间
 })