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 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index 19d9552..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", // 瀵煎叆鑳藉姏鑼冨洿 } @@ -186,6 +187,7 @@ doInsOrder: "/insOrderPlan/doInsOrder", //鎵ц妫�楠屾搷浣� saveInsContext: "/insOrderPlan/saveInsContext", //淇濆瓨妫�楠屽唴瀹� upPlanUser: "/insOrderPlan/upPlanUser", //浠诲姟浜ゆ帴 + upPlanUser2: "/insOrderPlan/upPlanUser2", //浠诲姟浜ゆ帴 verifyPlan: "/insOrderPlan/verifyPlan", //澶嶆牳妫�楠屼换鍔� submitPlan: "/insOrderPlan/submitPlan", //妫�楠屼换鍔℃彁浜� inspectionOrderDetailsTaskSwitching: "/insOrderPlan/inspectionOrderDetailsTaskSwitching", // 妫�楠屽崟璇︽儏-浠诲姟鍒囨崲 -- Gitblit v1.9.3