Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/courses/coursesPublic/ShixunChooseModal.js

@@ -101,6 +101,7 @@ class ShixunChooseModal extends Component{
     return(
 			shixunmodal===true?<NewShixunModel
 				statustype={'published'}
+				type={'shixuns'}
         datas={datas}
         category_id={this.props.match.params.category_id}
 				NewShixunModelType={shixunmodal}