解决冲突

src/app/routes/datatable/services/data.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 10:30:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:30:16
+ * @LastEditTime : 2022-04-07 15:07:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -82,6 +82,8 @@ export class DataService extends BaseService {
   $api_getTradingTrend = `/api/sdc/reportDataLargeScreen/getTradingTrend`;
   // 数据大屏-交易额(今日，本月，累计)
   $api_getTransactionAmount = `/api/sdc/reportDataLargeScreen/getTransactionAmount`;
+  // 数据大屏-交易分布
+  $api_getTransactionDistribution = `/api/sdc/reportDataLargeScreen/getTransactionDistribution`;