From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/admin/.env.development b/admin/.env.development
index e812482..53d536a 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,8 +3,6 @@
 # 椤圭洰涓婁笅鏂囪矾寰�
 VUE_APP_CONTEXT_PATH = './'
 
-# VUE_APP_API_URL  = 'http://localhost:10010'
-# VUE_APP_API_URL  = 'http://192.168.0.163:10010'
-VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
-# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
+VUE_APP_API_URL  = 'http://localhost:10010'
 
+#VUE_APP_API_URL  = 'https://zhcg.fnwtzx.com/gateway_interface'

--
Gitblit v1.9.3