解决冲突

This commit is contained in:
wangshiming
2022-02-24 14:35:53 +08:00
parent cbecaeaa15
commit 5fc5dd07a7
13 changed files with 899 additions and 56 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-04 21:05:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:08
* @LastEditTime : 2022-02-24 14:09:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\contract-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -22,6 +22,8 @@ import { ContractManagementDetailComponent } from './components/contract-detail/
import { ContractManagementPartnerComponent } from './components/contract-partner/contract-partner.component';
import { ContractManagementTemplateComponent } from './components/template/template.component';
import { ContractManagementTemplateTextComponent } from './components/contract-template-detail/contract-template-detail.component';
import { ContractManagementTemplateFrameComponent } from './components/contract-template-frame/contract-template-frame.component';
import { ContractManagementTemplatePartnerComponent } from './components/contract-template-partner/contract-template-partner.component';
const COMPONENTS: any = [
ContractManagementContractListComponent,
@ -33,7 +35,9 @@ const COMPONENTS: any = [
ContractManagementDetailComponent,
ContractManagementPartnerComponent,
ContractManagementTemplateComponent,
ContractManagementTemplateTextComponent
ContractManagementTemplateTextComponent,
ContractManagementTemplateFrameComponent,
ContractManagementTemplatePartnerComponent
];
const NOTROUTECOMPONENTS: any = [];
@NgModule({