From a836f03a5d1fbfa81e147d09ffdfa87ba3975c13 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 18 三月 2025 16:45:02 +0800
Subject: [PATCH] 1

---
 admin/.env.development |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/admin/.env.development b/admin/.env.development
index 0056808..b5a4f77 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -11,7 +11,14 @@
 VUE_APP_API_BASE_URL = 'http://192.168.0.134:10026'
 
 # 钀嶅鏈湴
+<<<<<<< HEAD
 # VUE_APP_API_BASE_URL = 'http://192.168.0.102:10026'
 
 # 鍚庣鎺ュ彛鍦板潃
 # VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
+=======
+#  VUE_APP_API_BASE_URL = 'http://192.168.0.129:10026'
+
+# 鍚庣鎺ュ彛鍦板潃
+VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
+>>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883

--
Gitblit v1.9.3