Conflicts: app/controllers/homework_attach_controller.rb app/views/courses/_member_list.html.erb Signed-off-by: alan <547533434@qq.com>