diff --git a/.env.development b/.env.development
index e476c013..c251f063 100644
--- a/.env.development
+++ b/.env.development
@@ -16,19 +16,14 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # h5专用地址
 
 # 王洋洋
-<<<<<<< HEAD
-#VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604'
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-#岳世凯
-#VITE_APP_BASE_H5_API_Url = 'http://25.64.16.141:9701'
-
-=======
 # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.140:9604'
+# 岳世凯
+# VITE_APP_BASE_H5_API_Url = 'http://25.64.16.141:9701'
 # 任东
 # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.130:9602'
 # 线上
+# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.18.122.65:7001'
 VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
->>>>>>> 05085e8e3e537d6cc35d677431086afd747b4eee