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

app/controllers/courses_controller.rb

@@ -1298,7 +1298,7 @@ class CoursesController < ApplicationController
     @user = current_user
     @is_teacher = @user_course_identity < Course::ASSISTANT_PROFESSOR
     @course_modules = @course.course_modules.where(hidden: 0).includes(first_categories: :children)
-    @hidden_modules = @course.course_modules.where(hidden: 1)
+    @hidden_modules = @course.course_modules.where.not(module_type: 'activity').where(hidden: 1)
     @second_category_type = ["shixun_homework", "graduation", "attachment", "board", "course_group", "video", "common_homework", "group_homework"]
   end