From 7a73f04bf17e3cd315c339a8f2b260f7524129a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 14:30:57 +0800 Subject: [PATCH] Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder # Conflicts: # public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js --- public/react/src/modules/tpm/NewHeader.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 0cb776245..2f1195644 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -702,7 +702,9 @@ submittojoinclass=(value)=>{ {/**/} -
+
console.log(value)} @@ -792,7 +794,7 @@ submittojoinclass=(value)=>{ {this.props.current_user&&this.props.current_user.user_identity==="学生"?"":
  • 新建课堂
  • }
  • 新建实训
  • 新建实践课程
  • -
  • 新建项目
  • +
  • 新建项目