解决冲突
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-23 13:39:58 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-28 13:40:47 | ||||
|  * @LastEditTime : 2022-03-01 13:41:57 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -78,6 +78,7 @@ | ||||
|                     (click)="openMap('start', idx)" | ||||
|                     formControlName="loadAddress{{ idx }}" | ||||
|                     placeholder="请输入装货地" | ||||
|                     readonly="true" | ||||
|                   /> | ||||
|                 </nz-input-group> | ||||
|                 <!-- <span style="padding: 0 10px" | ||||
| @ -130,6 +131,7 @@ | ||||
|                     (click)="openMap('end', idx)" | ||||
|                     formControlName="unloadAddress{{ idx }}" | ||||
|                     placeholder="请输入卸货地" | ||||
|                     readonly="true" | ||||
|                   /> | ||||
|                 </nz-input-group> | ||||
|                 <!-- <span style="padding: 0 10px" | ||||
|  | ||||
		Reference in New Issue
	
	Block a user