diff --git a/src/utils/request.js b/src/utils/request.js
index 8dc634c..1cabe46 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,12 +16,8 @@ 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,
-  baseURL:'http://192.168.2.28:9868/',
-  // baseURL:'http://118.31.7.2:9868/',
-=========
-  // baseURL:'http://118.31.7.2:9868/',
+
   baseURL:'http://192.168.2.16:9868/',
->>>>>>>>> Temporary merge branch 2
   // 超时
   timeout: 100000
 })