冲突解决

src/views/ebiz/sale/AttachmentManagement.vue

@@ -199,21 +199,14 @@
         </div>
       </div>
       <!-- 受益人类型 -->
-<<<<<<< Updated upstream
       <div v-if="typebeneficiary == true">
-=======
-      <div v-if="typebeneficiary">
->>>>>>> Stashed changes
         <div class="flex bg-white p10 align-items-c">
           <span>受益人附件</span>
         </div>
         <div class="m20 bg-white">
-<<<<<<< Updated upstream
           <van-cell-group>
             <van-field required label="受益人附件上传" disabled />
           </van-cell-group>
-=======
->>>>>>> Stashed changes
           <div @click="test('fileListtypebeneficiary', saleInsuredPersonInfo.idType)" class="flex">
             <van-uploader
               name="fileListtypebeneficiary"
@@ -848,11 +841,7 @@ export default {
               subBusinessNo: '',
               fileName: that.imgName
             }
-<<<<<<< Updated upstream
             that.list.push(obj)
-=======
-           that.list.push(obj)
->>>>>>> Stashed changes
           }
           // })
         } else {