解决冲突

This commit is contained in:
wangshiming
2022-02-24 14:01:02 +08:00
parent 329bca0f9a
commit cbecaeaa15

View File

@ -98,7 +98,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
containAllLable: true, containAllLable: true,
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
templateType2: { resourceType: {
title: '货源类型', title: '货源类型',
type: 'string', type: 'string',
default: '', default: '',
@ -142,7 +142,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
title: '货源类型', title: '货源类型',
width: '100px', width: '100px',
className: 'text-center', className: 'text-center',
index: 'contractType' index: 'resourceType'
}, },
{ title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' }, { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
{ {