解决冲突

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -664,13 +664,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     const prePay = this.sf7.value.prePay || 0;
     const toPay = this.sf7.value.toPay || 0
     const receiptPay = this.sf7.value.receiptPay || 0;
-    const oilCardPay = 0;
+    // const oilCardPay = 0;
     const subtotal = prePay + toPay + receiptPay;
     const params = {
       shipperId: this.envCache?.enterpriseId,
       enterpriseInfoId: this.envCache?.networkTransporterId,
       totalFreight:subtotal,
-      fuelCardAmount:oilCardPay,
+      // fuelCardAmount:oilCardPay,
       resourcetype:'1'
     }
     this.service