From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

---
 admin/.env.development |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/admin/.env.development b/admin/.env.development
index b5a4f77..29aec1d 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,23 +2,12 @@
 NODE_ENV = 'development'
 
 VUE_APP_CONTEXT_PATH = '/'
-VUE_APP_API_PREFIX = '/martempo_admin_interface'
-
-# 鐒︽澗鏈湴
-# VUE_APP_API_BASE_URL = 'http://192.168.0.191:10026'
-
-# 浠诲悍鏈湴
-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_PREFIX = '/bikeAdmin'
 
 # 鍚庣鎺ュ彛鍦板潃
 # 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 = 'http://192.168.0.3/bikeAdmin'
+# VUE_APP_API_BASE_URL = 'http://192.168.1.23:10026/'
 
 # 鍚庣鎺ュ彛鍦板潃
-VUE_APP_API_BASE_URL = 'https://dmtest.ahapp.net/bike_admin_api'
->>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
+# VUE_APP_API_BASE_URL = 'https://bikes.yxbhlt.cn/bike_admin_api'

--
Gitblit v1.9.3