解决冲突
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-06 15:01:40 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-24 16:24:32 | ||||
|  * @LastEditTime : 2022-02-28 19:34:38 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -25,7 +25,7 @@ export class TranAgreementComponent { | ||||
|   } | ||||
|  | ||||
|   ngOnInit() { | ||||
|     this.service.request(this.service.$api_getAgreementInfoByType,{type:'6'}).subscribe((res) => { | ||||
|     this.service.request(this.service.$api_getContractContent,{type:'6'}).subscribe((res) => { | ||||
|       if (res) { | ||||
|         this.agreement = res; | ||||
|       } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user