代码问题

src/views/erp/finance/payment/index.vue

@@ -1,5 +1,4 @@
-<template
-
+<template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form

src/views/mall/promotion/discountActivity/index.vue

@@ -75,11 +75,9 @@
           ~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
         </template>
       </el-table-column>
-      <<<<<<< HEAD
       <!--      <el-table-column label="商品图片" prop="spuName" min-width="80">-->
-      =======
+
       <!--      <el-table-column label="产品图片" prop="spuName" min-width="80">-->
-      >>>>>>> d2751c2fb2319474e9a271caa347ec31c870a1c8
       <!--        <template #default="scope">-->
       <!--          <el-image-->
       <!--            :src="scope.row.picUrl"-->