Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/courses_controller.rb

@@ -106,7 +106,7 @@ class CoursesController < ApplicationController
     videos = @course.videos
     videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
     @count  = videos.count
-    @videos = paginate videos
+    @videos = paginate videos.includes(user: :user_extension)
   end
 
   def delete_course_video

app/views/users/videos/_video.json.jbuilder

@@ -4,3 +4,7 @@ json.play_duration video.video_play_duration
 json.published_at video.display_published_at
 json.created_at video.display_created_at
 json.updated_at video.display_updated_at
+user = video.user
+json.user_name user&.real_name
+json.user_img url_to_avatar(user)
+json.user_login user&.login