From b545acd5def7b4024c0b8dfbf14c3f45bc873698 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 03 十二月 2025 09:35:24 +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 aa77cf1..78e33f9 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,15 +1,13 @@
 # 寮�鍙戠幆澧冮厤缃�
 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://192.168.0.7/system_gateway'
+
 # VUE_APP_API_URL  = 'http://127.0.0.1:10010'
-=======
-VUE_APP_API_URL  = 'http://127.0.0.1:10010'
->>>>>>> 5e6da22fb6f3b65e4dbf83896ad2a05d6d971432
 
 #key锛�045542fc5f436b75e6c911c5c84ff8cd
 #瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c

--
Gitblit v1.9.3