From 9628c86a6607380dbc7c0191a6055e07c6334657 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 01 Jun 2020 16:11:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/routeDom/oaRouteDom.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/routeDom/oaRouteDom.jsx b/src/routeDom/oaRouteDom.jsx
index eff360c..e7ccc56 100644
--- a/src/routeDom/oaRouteDom.jsx
+++ b/src/routeDom/oaRouteDom.jsx
@@ -37,10 +37,10 @@
<Route path="/logManage/operLog" component={OperLog} />
<Route path="/logManage/rawler" component={Rawler} />
<Route path="/personal/information" component={Information} />
- <Route path="/merits/meritsOverview/meritsDetail/:userId/:meritsMonth" component={MeritsDetail} />
+ <Route path="/merits/meritsOverview/meritsDetail/:userId/:boolean/:meritsMonth" component={MeritsDetail} />
<Route path="/merits/meritsOverview" component={MeritsOverview} />
<Route path="/merits/meritsDispose" component={MeritsDispose} />
- <Route path="/merits/meritsExamine" component={MeritsExamine} />
+ <Route path="/merits/meritsExamine" component={MeritsDetail} />
{/* <Route path="/" component={Workbench} /> */}
--
Gitblit v1.8.0