From cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 16:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/.env.development |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/admin/.env.development b/admin/.env.development
index fe7c9be..b5a4f77 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -7,11 +7,18 @@
 # 鐒︽澗鏈湴
 # VUE_APP_API_BASE_URL = 'http://192.168.0.191:10026'
 
-# 钀嶅鏈湴
-# http://192.168.0.36:10012/doc.html#/home
+# 浠诲悍鏈湴
+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