From 69089dd9af376e0093bdef9520b60e54f2c925eb Mon Sep 17 00:00:00 2001
From: li tong bao <2903733959@qq.com>
Date: Fri, 10 Jun 2022 10:34:12 +0800
Subject: [PATCH] =?UTF-8?q?---=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/common/constant.js b/src/common/constant.js
index 72b9c51..dc069fb 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -9,11 +9,7 @@
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
-<<<<<<< HEAD
 // export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
-=======
-// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
->>>>>>> 订单售后v2
 export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰