Merge branch 'dev_hs' into dev_aliyun

app/controllers/exercises_controller.rb

@@ -1288,7 +1288,8 @@ class ExercisesController < ApplicationController
       normal_status(0,"正在下载中")
     else
       set_export_cookies
-      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets
+      content[:disposition] = "inline"
+      render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets, disposition: 'inline'
     end
   end