diff --git a/.env.development b/.env.development
index 14ee346..fe20df3 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,7 @@ VITE_APP_TITLE = 新能源项目管理平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-<<<<<<< HEAD
-VITE_APP_BASE_API = 'http://192.168.110.119:8899'
-=======
-VITE_APP_BASE_API = 'http://192.168.110.119:8898'
->>>>>>> f37ca487f6194c94e3515dc4824f5d7527a32013
+VITE_APP_BASE_API = 'http://192.168.110.159:8898'
 
 # 无人机接口地址