From d6a884f942399c1ab708f6d4f18395bc323b46c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 12 五月 2025 11:18:36 +0800
Subject: [PATCH] 最新版本541200007

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

diff --git a/admin/.env.development b/admin/.env.development
index fc24b85..577bf1c 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,12 +2,7 @@
 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