Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

config/routes.rb

@@ -387,6 +387,7 @@ RedmineApp::Application.routes.draw do
       get 'user_resource_type'
       get 'user_ref_resource_search'
       post 'import_resources_to_homework'
+      get 'dealwith_apply_request'
       get 'store_selected_resource'
       # end
     end