Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

config/routes.rb

@@ -195,7 +195,7 @@ Rails.application.routes.draw do
         resource :unread_message_info, only: [:show]
 
         # 视频
-        resources :videos, only: [:index, :update] do
+        resources :videos, only: [:index, :update, :destroy] do
           collection do
             get :review
             post :batch_publish