From 94de735233383fe644ec0401465e8e85c8999179 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 10:01:09 +0800
Subject: [PATCH] 钥匙柜开门添加 指纹方式

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

diff --git a/admin/.env.development b/admin/.env.development
index 6ffc081..137168c 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.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://192.168.0.7/system_gateway'
 
 # VUE_APP_API_URL  = 'http://localhost:10010'
 

--
Gitblit v1.9.3