From bf33ebfdf06fe496bf302fc4551615d21e90ff72 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 14 十一月 2025 11:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

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

diff --git a/admin/.env.development b/admin/.env.development
index fc24b85..fd868c4 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,12 +2,6 @@
 NODE_ENV = 'development'
 
 # VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
-<<<<<<< HEAD
-VUE_APP_API_URL  = 'http://192.168.0.100:10010'
-# VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
-=======
-#VUE_APP_API_URL  = 'http://192.168.0.104:10010'
- VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
->>>>>>> f49ead8710e093ee1d2d3ed50870497f07dee9fa
+# VUE_APP_API_URL  = 'http://192.168.1.116:10010'
+VUE_APP_API_URL  = 'https://atwl.ahzyssl.com/zhyq_interface'
 # VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
-

--
Gitblit v1.9.3