From dd929871969c4275eeb3246d7c5c0d6f35060b10 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 31 十二月 2024 14:52:47 +0800
Subject: [PATCH] 接口文件冲突

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

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 842a970..6372293 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -268,6 +268,8 @@
   getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 鏌ョ湅妫�楠屽巻鍙插垪琛�
   preview: "/insOrderPlan/preview", // csv鏂囦欢棰勮
   outInsOrderState: "/insOrderPlan/outInsOrderState", // 妫�楠屼换鍔℃壂鐮佸嚭搴�
+  // insOrderPlan.cancelSubmitPlan
+  cancelSubmitPlan: "/insOrderPlan/cancelSubmitPlan", // 妫�楠屼换鍔℃挙閿�
 }
 
 const systemLog = {
@@ -365,6 +367,7 @@
   testProductByDay: "/report/testProductByDay", //棣栨娴嬮」鐩粺璁�
   manHourByStation: "/report/manHourByStation", //棣栭〉宸ユ椂缁熻
   manHourByPerson: "/report/manHourByPerson", //棣栭〉宸ユ椂缁熻
+  timeByStation: "/report/timeByStation", //绔欑偣宸ユ椂缁熻
 }
 const certification = {
   getCertificationDetail: "/certification/getCertificationDetail", //鏌ヨ璧勮川鏄庣粏鍒楄〃

--
Gitblit v1.9.3