From 23e9c8e4e541b961db66681fec39767dd93be90f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 27 十一月 2025 16:10:50 +0800
Subject: [PATCH] 改bug

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

diff --git a/admin/.env.development b/admin/.env.development
index 81bd508..aa77cf1 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,16 +1,15 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
 
+<<<<<<< HEAD
 # VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
 
 VUE_APP_API_URL  = 'http://192.168.1.45:10010'
 
 # VUE_APP_API_URL  = 'http://127.0.0.1:10010'
-
-# VUE_APP_API_URL  = 'http://localhost:10010'
-
-# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
-# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
+=======
+VUE_APP_API_URL  = 'http://127.0.0.1:10010'
+>>>>>>> 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432
 
 #key锛�045542fc5f436b75e6c911c5c84ff8cd
 #瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c

--
Gitblit v1.9.3