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

app/models/graduation_work.rb

@@ -123,7 +123,7 @@ class GraduationWork < ApplicationRecord
 
   # 作品是否被评阅过
   def scored?
-    graduation_work_scores.where.not(core: nil).exists?
+    graduation_work_scores.where.not(score: nil).exists?
   end
 
   def work_cross_teacher_ids

app/views/graduation_works/edit.json.jbuilder

@@ -13,6 +13,7 @@ end
 if @task.task_type == 2
   json.is_leader_work @work.user_id == @commit_user_id
   json.members @work_members do |member|
+    json.user_id member.user_id
     json.is_leader_work @work.user_id == @commit_user_id
     json.user_name member.user.real_name
     json.group_name member.course_group_name