From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突

---
 .env.development |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 9feecc6..5af9ff3 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@
 #VITE_API_URL = 'http://192.168.0.35:8008'
 #李宇飞接口地址
 
-VITE_API_URL = 'http://192.168.0.50:8008'
+#VITE_API_URL = 'http://192.168.0.50:8008'
 #张凤接口地址
 
 #VITE_API_URL = 'http://192.168.0.29:8008'
@@ -16,7 +16,7 @@
 #VITE_API_URL = 'http://192.168.0.69:8008'
 #戚会山接口地址
 
-#VITE_API_URL = 'http://121.239.169.27:16006/safeplatform'
+VITE_API_URL = 'http://121.239.169.27:16006/safeplatform'
 #线上正式环境接口地址
 
 #VITE_API_URL_OUT = 'http://121.239.169.27:16006/safeplatform-out'
@@ -35,7 +35,7 @@
 #VITE_API_URL = 'http://192.168.0.52:7021/safeplatform'
 #本地测试接口地址
 
-#VITE_API_URL_SOCKET = 'http://192.168.0.52:7021/safeplatform'
+VITE_API_URL_SOCKET = 'http://192.168.0.52:7021/safeplatform'
 #本地测试websocket接口地址
 
 #VITE_API_URL = 'http://192.168.0.29:7008'

--
Gitblit v1.9.2