From 7fa65b3e866b1d360e6825197b6d1dca549796e2 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 11:25:55 +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

---
 pages/my/historyMy.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index a1df4ff..0001078 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -39,11 +39,7 @@
 							<view class="item-view-bottom-qian">
 								<span>￥</span>
 								<span>{{item.price}}</span>
-<<<<<<< .mine
 								<span>/套</span>
-=======
-
->>>>>>> .theirs
 								<span>￥</span>
 								<span>{{item.oldPrice}}</span>
 							</view>