Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/graduation_tasks/index.json.jbuilder

@@ -11,6 +11,7 @@ json.tasks @tasks.each do |task|
   task_curr_status = task_curr_status(task, @course)
   json.status task_curr_status[:status]
   json.status_time task_curr_status[:time]
+  json.author task.user.real_name
 
   unless task_curr_status[:status].include?("未发布")
     json.commit_count grduationwork_count task, 1

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -274,7 +274,7 @@ class GraduateTaskItem extends Component{
             <p className="color-grey mt16 fl">
               <span className="mr50">
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
-
+                { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
 								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9 font-14">{discussMessage.commit_count} 已交</span>}
 								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9 font-14">{discussMessage.uncommit_count} 未交</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}