diff --git a/src/common/constant.js b/src/common/constant.js
index 9a4f083..d044f8e 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -9,13 +9,8 @@ export const BASE_URL = `https://test.zzfzyc.com/lymarket` // 测试环境
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
-<<<<<<< HEAD
-// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
-export const BASE_URL = `http://192.168.1.7:50001/lymarket` // 添
-=======
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
 // export const BASE_URL = `http://192.168.1.7:50002/lymarket` // 添
->>>>>>> f38df6f9f11edcef0ff8efb9504e2f5df8df4078
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 
 // CDN