diff --git a/src/utils/request.js b/src/utils/request.js
index 13b4ff36..992fa8ac 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,14 +10,8 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
-  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
-=======
 
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-
->>>>>>> 3b215d048bf49b3019c70e80ff7dbd7ebd5869a4
   timeout: 1500000 // 请求超时时间
 })