From 7dedcf773fbf0cb1791a83568d282a688d0b6f53 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 24 Apr 2026 18:18:25 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E4=BD=93=E9=AA=8C=E5=BA=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/index.vue | 3 +++
 1 file changed, 3 insertions(+)

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