fix: merge 合并时问题修复

src/pages/carConfirm/batchSign.vue

@@ -176,10 +176,6 @@ export default {
     // 签署
     async signContact () {
       if (!this.checkList.length) return hlsPopup.showLongCenter('无可需要签署的电子合同')
-<<<<<<< HEAD
-
-=======
->>>>>>> dev20230131_android
       let url = process.env.basePath + 'batch_sign'
       let data_class = this.$route.query.name === 'confirmList' ? 'LEASE_ITEM' : 'PRJ_CONFIRM'
       let param = {