解决冲突
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-25 20:18:52 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-25 10:29:05 | ||||
|  * @LastEditTime : 2022-02-25 14:04:01 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -18,7 +18,7 @@ | ||||
|             <sf #sf [schema]="schema" [formData]="sfdata" [button]="'none'" [ui]="ui"> | ||||
|                 <ng-template sf-template="freightPrice" let-i let-ui="ui"> | ||||
|                     <nz-input-group [nzAddOnAfter]="addOnAfterTemplate"> | ||||
|                         <nz-input-number [(ngModel)]="minInsurancePrice"  [nzMin]="0" style="width: 100%"></nz-input-number> | ||||
|                         <nz-input-number [(ngModel)]="minInsurancePrice"  [nzMin]="0" ></nz-input-number> | ||||
|                       </nz-input-group> | ||||
|                       <ng-template #addOnAfterTemplate> | ||||
|                           <span >元</span> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user