From 56b7f5dd6fda8c39f0b7038a265d507e0d22227c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 14:56:35 +0800
Subject: [PATCH] 合并冲突

---
 src/assets/api/controller.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index a74994c..e1b97c9 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -124,6 +124,7 @@
   upProduct: "/capacityScope/upProduct", //淇敼浜у搧
   getItemTree: "/capacityScope/getItemTree", //鑾峰彇妫�楠屽璞℃爲
   importData: "/capacityScope/importData", //瀵煎叆妫�楠岄」鐩�
+  importEquipData: "/capacityScope/importEquipData", //瑁呭鐢电紗-瀵煎叆妫�楠岄」鐩�
   importExcel: "/capacityScope/importExcel", // 瀵煎叆鑳藉姏鑼冨洿
 }
 

--
Gitblit v1.9.3