解决冲突

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,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-01-07 13:27:10
* @LastEditors : Shiming
* @LastEditTime : 2022-02-23 19:39:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html
* @LastEditTime : 2022-02-24 14:10:45
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\template\\template.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -17,10 +17,10 @@
<app-contract-management-template-detail-complaint></app-contract-management-template-detail-complaint>
</nz-tab>
<nz-tab nzTitle="框架合同">
<app-contract-management-contract-frame></app-contract-management-contract-frame>
<app-contract-management-template-frame-complaint></app-contract-management-template-frame-complaint>
</nz-tab>
<nz-tab nzTitle="合伙人合同">
<app-contract-management-contract-partner></app-contract-management-contract-partner>
<app-contract-management-template-partner-complaint></app-contract-management-template-partner-complaint>
</nz-tab>
</nz-tabset>
</ng-template>