解决冲突
This commit is contained in:
		| @ -812,12 +812,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { | ||||
|     const expenseList = [ | ||||
|       { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay, id: this.sf7data?.prePayId ? this.sf7data?.prePayId : '' }, | ||||
|       { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay, id: this.sf7data?.toPayId ? this.sf7data?.toPayId : '' }, | ||||
|       { | ||||
|         expenseCode: 'OIL', | ||||
|         expenseName: '油卡', | ||||
|         price: 0, | ||||
|         id: '' | ||||
|       }, | ||||
|       { | ||||
|         expenseCode: 'BACK', | ||||
|         expenseName: '回单付', | ||||
|  | ||||
		Reference in New Issue
	
	Block a user