From 0b532dd4ea4e8e5e70cca17f48c6cc54f305f13d Mon Sep 17 00:00:00 2001
From: proudlx <965752348@qq.com>
Date: Sun, 25 Apr 2021 17:36:31 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=98=AF=E5=90=A6=E9=95=BF=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/insureAgain/InsureInformation.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/ebiz/insureAgain/InsureInformation.vue b/src/views/ebiz/insureAgain/InsureInformation.vue
index 9f2c05595..cfa3e4657 100644
--- a/src/views/ebiz/insureAgain/InsureInformation.vue
+++ b/src/views/ebiz/insureAgain/InsureInformation.vue
@@ -575,11 +575,7 @@ export default {
         })
         this.setInsuredCustomerMarriage(this.insuredPersonInfo.marriage)
         //是否长期
-<<<<<<< HEAD
-        this.insuredPersonInfo.effectiveDateType = res.orderDTO.insuredDTOs[0].effectiveDateType == 'false' ? false : true
-=======
         this.insuredPersonInfo.effectiveDateType = this.insuredPersonInfo.effectiveDateType == 'true' ? true : false
->>>>>>> 46e061eb394896364b6ab23f1914ba4a7c286241
         if (this.insuredPersonInfo.homeProvince.length) {
           this.insuredHomeName = getAreaName([
             { code: this.insuredPersonInfo.homeProvince },