解决冲突

2022-02-24 14:01:02 +08:00
parent 329bca0f9a
commit cbecaeaa15
1 changed files with 2 additions and 2 deletions
--- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
+++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts
@ -98,7 +98,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
            containAllLable: true,
          } as SFSelectWidgetSchema
        },
-        templateType2: {
+        resourceType: {
          title: '货源类型',
          type: 'string',
          default: '',
@ -142,7 +142,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
        title: '货源类型',
        width: '100px',
        className: 'text-center',
-        index: 'contractType'
+        index: 'resourceType'
      },
      { title: '创建人', index: 'createUserId', width: '120px', className: 'text-center' },
      {