From 581a6385e5422ed37c4b5c77f3a87e9c16cbff1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BE=81?= <zhangz@163.com>
Date: Tue, 24 May 2022 10:33:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/module/Banner.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pages/index/module/Banner.vue b/pages/index/module/Banner.vue
index d39be4a..892d1b9 100644
--- a/pages/index/module/Banner.vue
+++ b/pages/index/module/Banner.vue
@@ -11,13 +11,8 @@
     <el-carousel height="360px" indicator-position="outside">
       <el-carousel-item>
         <el-image
-<<<<<<< HEAD
-          @click="onAdvBannerClick(1)"
-          :src="banner1"
-=======
           @click="onAdvBannerClick(0)"
           :src="adv1"
->>>>>>> fix/ui-0521-zz
           fit="cover"
         ></el-image>
       </el-carousel-item>