From 907c9e16815f75493e0ea8f7866d45088470a3fa Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Tue, 14 Feb 2023 17:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/environments/environment.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0f54f2a..ef7037a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,13 +7,6 @@ export const environment = {
   baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
   orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
-<<<<<<< HEAD
-  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-=======
-  baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
->>>>>>> ba414dc905d017cd146e4ec55dd22c4ff7b94f34
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };