Chore(入驻):解决合并冲突未完全解决问题
This commit is contained in:
@@ -39,10 +39,6 @@
|
|||||||
@click="toTravelResidence"
|
@click="toTravelResidence"
|
||||||
/>
|
/>
|
||||||
<image
|
<image
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
v-show="partnerType === 'province_partner' || partnerType === ''"
|
|
||||||
>>>>>>> 320bda6ed8582fd2c81f73c272076e2b218418ab
|
|
||||||
:src="images.experienceStoreImage"
|
:src="images.experienceStoreImage"
|
||||||
class="img-item"
|
class="img-item"
|
||||||
mode="widthFix"
|
mode="widthFix"
|
||||||
|
|||||||
Reference in New Issue
Block a user