From 14d775b307dfae170bda6f0eb423c3c858110cb8 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Thu, 8 Sep 2022 17:05:40 +0800
Subject: [PATCH] =?UTF-8?q?data-dictionary.js=E8=A7=A3=E5=86=B3=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 38050a1bc..345cc202e 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -3693,8 +3693,6 @@ export default {
     {
       code: "MedicalInsuranceForMajorDiseases",
       label: "元"
-<<<<<<< HEAD
-=======
     },
     {
       code: 'SevereMalignantInsurance',
@@ -3723,7 +3721,6 @@ export default {
     {
       code: 'HighSpeedTrainAccidentDeathOrTotalDisabilityInsurance',
       label: '元'
->>>>>>> 95a03e7d... 【个险-国富人寿富贵年年终身寿险】国富人寿富贵年年终身寿险和国富人寿鑫享年年终身寿险（B款），一次性交清, 选择5,10,15,20 年交时, 保费试算有问题，所有调一下执行顺序
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，