From 63845bd0d5991a940f84549c2bb94a07ffe35664 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 09:57:20 +0800
Subject: [PATCH] 钥匙柜大屏

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

diff --git a/admin/.env.development b/admin/.env.development
index 6ffc081..c574b58 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,15 +3,9 @@
 
 # VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
 
-<<<<<<< HEAD
 # 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://localhost:10010'
-
-#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
->>>>>>> ce3b9c67f6b2ee83d7edf593d06221d909e9afda
 
 # VUE_APP_API_URL  = 'http://localhost:10010'
 

--
Gitblit v1.9.3