From 2ddec61770c9486197dc7ec5f7914037cda3dfbf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 16 六月 2025 10:39:54 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

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

diff --git a/admin/.env.development b/admin/.env.development
index fc24b85..8d0f690 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,12 +2,8 @@
 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://10.50.250.253:8088/gateway_interface'
 
+

--
Gitblit v1.9.3