From 2e52420386ffe249da1e3d87e7236ce458acc851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 30 Aug 2019 16:32:14 +0800
Subject: [PATCH] Merge branches 'dev_Ysl' and 'topic_bank' of
 https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/Index.js
---
 .../src/modules/user/usersInfo/banks/BanksIndex.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
index c1b67fc5e..14ca81e17 100644
--- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
+++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js
@@ -134,31 +134,31 @@ class BanksIndex extends Component{
             {/*题库问卷编辑详情*/}
             <Route path="/courses/poll/:workid/edit"
                    render={
-                     (props) => (<PollNewQuestbank {...this.props} {...props} {...this.state} {...common} />)
+                     (props) => (<PollNewQuestbank {...this.props}  {...this.state} {...common} />)
                    }
             ></Route>
             {/*毕设任务题库详情*/}
             <Route path="/banks/gtask/:workid"
                    render={
-                     (props) => (<Completetaskpage {...this.props} {...props} {...this.state} {...common} />)
+                     (props) => (<Completetaskpage {...this.props}  {...this.state} {...common} />)
                    }
             ></Route>
             {/*毕设内容题库详情*/}
             <Route path="/banks/gtopic/:workid"
                    render={
-                     (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state}  {...common}/>)
+                     (props) => (<CompletetopicdePage {...this.props} {...this.state}  {...common}/>)
                    }
             ></Route>
             {/*分组作业题库详情*/}
             <Route path="/banks/group/:workid"
                    render={
-                     (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} {...common} />)
+                     (props) => (<GroupjobbankPage {...this.props}  {...this.state} {...common} />)
                    }
             ></Route>
             {/*  普通作业题库详情*/}
             <Route path="/banks/normal/:workid"
                    render={
-                     (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
+                     (props) => (<Generaljobbankdetails {...this.props}  {...this.state} {...common} />)
                    }
             ></Route>
           </Switch>