From acf90ad8e6bea592124541324467360cef565ff5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 06 二月 2026 14:14:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang

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

diff --git a/admin/.env.development b/admin/.env.development
index 867c3b0..3ee41f2 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,10 +1,6 @@
 # 寮�鍙戠幆澧冮厤缃�
 NODE_ENV = 'development'
-<<<<<<< HEAD
+# VUE_APP_API_URL = 'https://test.doumee.cn/dianjiang_admin_api/'
 VUE_APP_API_URL = 'http://192.168.0.7/dianjiang_admin_api/'
-=======
-
-# 椤圭洰涓婁笅鏂囪矾寰�
 VUE_APP_CONTEXT_PATH = '/'
-VUE_APP_API_URL = 'http://localhost:11010'
->>>>>>> d5810177a4e77ea273971e51dd150bd84906de6f
+

--
Gitblit v1.9.3