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

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>