hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-11 12:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

data-dictionary.js解决冲突

Browse Source
This commit is contained in:
li.yuetong
2022-09-08 17:05:40 +08:00
parent 8f4b81f451
commit 14d775b307
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/js/utils/data-dictionary.js
View File

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