From 0d1dfae3bd741df2c2dc7fa5ddfa90d7ae6b928d Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 27 Apr 2026 14:21:12 +0800
Subject: [PATCH] =?UTF-8?q?Chore(=E5=85=A5=E9=A9=BB):=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E6=9C=AA=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue
index 87a998b..cc3e6c0 100644
--- a/pkg_join/views/index.vue
+++ b/pkg_join/views/index.vue
@@ -39,10 +39,6 @@
       @click="toTravelResidence"
     />
     <image
-<<<<<<< HEAD
-=======
-      v-show="partnerType === 'province_partner' || partnerType === ''"
->>>>>>> 320bda6ed8582fd2c81f73c272076e2b218418ab
       :src="images.experienceStoreImage"
       class="img-item"
       mode="widthFix"