From 3a154bdb0a5aaa2c0ac3eac95a6ba747068bd454 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 13 一月 2026 10:00:37 +0800
Subject: [PATCH] 优化

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

diff --git a/admin/.env.development b/admin/.env.development
index 9ab2336..94ee3d4 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,14 +1,21 @@
 # 寮�鍙戠幆澧冮厤缃�
 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  = 'https://atwl.ahzyssl.com/zhyq_interface'
+# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
+=======
 # VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
 
 #VUE_APP_API_URL  = 'http://192.168.1.82:10010'
 
-VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
+#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
 
 VUE_APP_API_URL  = 'http://localhost:10010'
 
 #key锛�045542fc5f436b75e6c911c5c84ff8cd
 #瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
 VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
+>>>>>>> 5e91539195106afc3a03e7bd006786409ecd9b5d

--
Gitblit v1.9.3