解决冲突

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-22 16:51:29
+ * @LastEditTime : 2022-04-27 15:32:22
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -608,11 +608,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
         title: '变更前',
         width: '100px',
         className: 'text-center',
-        index: 'amountAfterChange',
-        render: 'amountAfterChange'
+        index: 'amountBeforeChange',
+        render: 'amountBeforeChange'
       },
       { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
-      { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
+      { title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' }
     ];
   }
   /**