From a075ef6b7cbd09d727068ef3d7e08691775dbb16 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 17:58:58 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 28c7850..61f59e7 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -14,7 +14,7 @@
 		StandardTemplate,
 		insOrder,
 		sampleOrder,
-    	insOrderPlan
+    insOrderPlan
 	}
 }
 
@@ -133,6 +133,7 @@
 const insOrderPlan = {
 	selectInsOrderPlanList: "/insOrderPlan/selectInsOrderPlanList", //鏌ヨ妫�楠屼换鍔�
   claimInsOrderPlan: "/insOrderPlan/claimInsOrderPlan",//璁ら妫�楠屼换鍔�
+	doInsOrder: "/insOrderPlan/doInsOrder",//鎵ц妫�楠屾搷浣�
 }
 
 const systemLog = {

--
Gitblit v1.9.3