解决冲突

This commit is contained in:
wangshiming
2022-02-24 10:33:35 +08:00
parent 6f8929037e
commit 0147e0034d
16 changed files with 565 additions and 165 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-01-25 14:25:49
* @LastEditTime : 2022-02-24 10:23:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -16,12 +16,12 @@ import { NzModalService } from 'ng-zorro-antd/modal';
import { ContractManagementService } from '../../services/contract-management.service';
@Component({
selector: 'app-contract-management-template-detail-complaint',
selector: 'app-contract-management-template-text-complaint',
templateUrl: './contract-template-detail.component.html',
styleUrls: ['./contract-template-detail.component.less'],
providers: [DatePipe]
})
export class ContractManagementTemplateDetailComponent implements OnInit {
export class ContractManagementTemplateTextComponent implements OnInit {
constructor(
private nzModalService: NzModalService,
public service: ContractManagementService,