diff --git a/.env.development b/.env.development
index a8ebcf8..090b058 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,11 @@ VITE_APP_ENV = 'development'
 # 李陈杰 209
 #  VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
+<<<<<<<<< Temporary merge branch 1
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+=========
 VITE_APP_BASE_API = 'http://192.168.110.209:8899'
+>>>>>>>>> Temporary merge branch 2
 # 罗成
 # VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 朱银