From 5f6604767a5d907b999bbc250170e6cc1aff7bdd Mon Sep 17 00:00:00 2001
From: "xunyu.guo" <916759660@qq.com>
Date: Mon, 10 Jan 2022 16:31:09 +0800
Subject: [PATCH] 1

---
 vue/src/components/ImportExcel-base/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue
index 31f247b7..613e5d8b 100644
--- a/vue/src/components/ImportExcel-base/index.vue
+++ b/vue/src/components/ImportExcel-base/index.vue
@@ -352,13 +352,13 @@ export default {
 		HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
           HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单
 
-<<<<<<< .mine
+
           HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
           HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单导入
-=======
+
           HQ_M_OUTORDER: "/api/settleaccount/WMSHQMKanbanoutput/ExcelImport", //红旗M平台出库单导入
           HQ_Y_OUTORDER: "/api/settleaccount//ExcelImport", //一汽轿车平台出库单导入
->>>>>>> .theirs
+
           sparepartoutorder:
             "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入
           bomdatabase: "/api/settleaccount/bom/ExcelImport",