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

app/services/admins/import_course_member_service.rb

@@ -36,10 +36,10 @@ class Admins::ImportCourseMemberService < ApplicationService
 
     member = course.course_members.find_by(user_id: user.id, role: data.role.to_i)
     # 如果已是课堂成员且是学生身份and不在指定的分班则移动到该分班
-    if member.present? && member.role == 'STUDENT' && course_group && member.course_group_id != course_group&.id
-      member.update!(course_group_id: course_group&.id)
+    if member.present? && member.role == 'STUDENT' && course_group && member.course_group_id != course_group&.id.to_i
+      member.update!(course_group_id: course_group&.id.to_i)
     elsif member.blank?
-      course.course_members.create!(user_id: user.id, role: data.role.to_i, course_group_id: course_group&.id)
+      course.course_members.create!(user_id: user.id, role: data.role.to_i, course_group_id: course_group&.id.to_i)
       extra =
         case data.role.to_i
         when 2 then 9

config/locales/zh-CN.yml

@@ -170,7 +170,7 @@ zh-CN:
         name: '名称'
       tag_discipline:
         name: '名称'
-      live:
+      live_link:
         description: '说明'
         url: '链接'