From 65c8026eaeff3d769a1d168933e13035708233e0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 05 Sep 2024 10:00:48 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/router/router.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/gz-customerSystem/src/router/router.js b/gz-customerSystem/src/router/router.js
index 288ae76..e130197 100644
--- a/gz-customerSystem/src/router/router.js
+++ b/gz-customerSystem/src/router/router.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-28 11:22:41
- * @LastEditTime: 2024-08-27 10:42:32
+ * @LastEditTime: 2024-09-03 14:58:33
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 路由
@@ -140,6 +140,8 @@
import EventFlow from "../views/register/eventFlow";
//办理反馈
import HandleFeedback from "../views/register/handleFeedback";
+//档案信息
+import FileMessage from "../views/register/matterDetail/fileMessage";
import Test from "../views/test";
@@ -215,6 +217,10 @@
<Route path="visit/:id?" element={<Visit />} />
<Route path="visit/eventFlow" element={<EventFlow />} />
<Route path="visit/handleFeedback" element={<HandleFeedback />} />
+ <Route path="visit/fileMessage" element={<FileMessage />} />
+
+
+
{/* 工作流模块 */}
<Route path="workflowTemplate" element={<WorkflowTemplate />} />
<Route path="workflowTemplate/workflowTemplateEdit" element={<WorkflowTemplateEdit />} />
--
Gitblit v1.8.0