merge from develop

config/routes.rb

@@ -942,6 +942,10 @@ Rails.application.routes.draw do
     resources :nps do
       post :switch_change, on: :collection
     end
+    resources :feedbacks, only: [:index, :destroy] do 
+      get :new_history, on: :member
+      post :create_history, on: :member
+    end
     resources :laboratories, only: [:index, :create, :destroy, :update] do
       member do
         get :shixuns_for_select