From ef1c13dcd215e87fc5d070fea53e94629a4c4d86 Mon Sep 17 00:00:00 2001
From: wusijian0117 <2910410219@qq.com>
Date: Mon, 16 Mar 2026 16:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=80=E5=8F=91=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81,=E7=BB=9F=E4=B8=80API=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=B8=BA192.168.100.84,=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.env.development b/.env.development
index 49d8347..483fe4b 100644
--- a/.env.development
+++ b/.env.development
@@ -5,24 +5,14 @@ ENV = 'development'
 # 后端服务地址配置
 # 切换环境时，修改下面两个地址的 IP 即可
 # 当前环境: 192.168.3.11(本地开发地址)
-<<<<<<< HEAD
 # 备用环境: 192.168.3.200(服务器地址)
-=======
->>>>>>> 2ba918232f1edc4fbb741a0423238bef6b0feb2f
 # 备用环境: 116.204.74.41(公网开发地址)
 # 备用环境: 172.20.10.7(张哥)
 # ============================================================
 
 # 主服务地址（端口8808）
 # 用途: 系统管理、用户认证、权限控制、模块开通等原有功能
-<<<<<<< HEAD
 VITE_API_URL = 'http://192.168.100.84:8808/'
 # 新功能服务地址（端口8000）
 # 用途: 资产管理、分类、SKU、订单等新业务模块
 VITE_NEW_API_URL = 'http://192.168.100.84:8000/' 
-=======
-VITE_API_URL = 'http://116.204.74.41:8808/'
-# 新功能服务地址（端口8000）
-# 用途: 资产管理、分类、SKU、订单等新业务模块
-VITE_NEW_API_URL = 'http://116.204.74.41:8000/'
->>>>>>> 2ba918232f1edc4fbb741a0423238bef6b0feb2f