diff --git a/src/utils/request.js b/src/utils/request.js
index 161bcf4..41fd6da 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,10 +16,6 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: import.meta.env.VITE_APP_BASE_API,
-<<<<<<<<< Temporary merge branch 1
-  baseURL:'http://118.31.7.2:9868/',
-=========
-  baseURL:'http://192.168.2.28:9868/',
   // baseURL:'http://118.31.7.2:9868/',
   baseURL:'http://192.168.2.28:9868/',
   // 超时