fix bug

2022-05-09 13:47:02 +08:00
parent abe398d0c2
commit 456c24e79d
1 changed files with 0 additions and 4 deletions
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
        className: 'text-center',
        index: 'paymentMethodRate',
        width: 130,
-<<<<<<< HEAD
        format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
-=======
-        format: record => `${record.paymentMethodRate * 100}%`
->>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
      },
      { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
      { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },