解决冲突

src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:21
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-27 17:19:41
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order-detail\\receipt-order-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper title="收款单" [logo]="logo">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -30,7 +40,7 @@
           {{ costInfo?.brmtypeLabel }}
         </se>
         <se label="收款账户" required>
-          {{ costInfo?.ltdaccountId }}
+          {{ costInfo?.ltdaccountCode }}
         </se>
         <se label="尾差">
           {{ costInfo?.recnopay |currency }}

src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts

@@ -209,7 +209,7 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit
       // { title: '费用号', index: 'feeCode',  width: 180, className: 'text-left' },
       { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' },
       { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' },
-      { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' },
+      { title: '收款账户', index: 'ltdaccountCode', width: 200, className: 'text-left' },
       {
         title: '到账金额',
         index: 'brmmoney',