解决冲突

src/app/routes/tax-management/services/tax-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 10:30:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 14:18:01
+ * @LastEditTime : 2022-04-07 20:41:55
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,6 +27,14 @@ export class TaxManagementService extends BaseService {
   // 查询运营报表
   $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
   $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
+  // 订单上报列表
+  $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
+  // 根据订单Id更新税务订单
+  $api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
+  // 撤回税务订单
+  $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`;
+  // 上传税务订单
+  $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`;
   $api_recall_reporting = ``; // 撤回
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = ``; // 修改上传设置