Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

# Conflicts: # public/react/src/modules/paths/PathDetail/DetailCards.js
5 years ago · 443dc7115a
parent 66869129c0 274910d0a9
commit 443dc7115a
1 changed files with 1 additions and 1 deletions
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@ -336,7 +336,7 @@ class DetailCards extends Component{
      showparagraphindex
    }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-
+   // console.log("zzz"+this.props.MenuItemsindextype)
    return(
      <div>
 				{AccountProfiletype===true?<AccountProfile