fixed 合并主干所有代码

config/routes.rb

@@ -936,8 +936,6 @@ Rails.application.routes.draw do
       get :contrast, on: :collection
     end
 
-    resources :users do
-      get :export, on: :collection
     resources :organizations, only: [:index, :edit, :show, :destroy] do
       member do
         post :open_cla
@@ -945,6 +943,7 @@ Rails.application.routes.draw do
       end
     end
     resources :users, only: [:index, :edit, :update, :destroy] do
+      get :export, on: :collection
       member do
         post :reward_grade
         post :lock
@@ -1075,7 +1074,7 @@ Rails.application.routes.draw do
     resources :nps do
       post :switch_change, on: :collection
     end
-    resources :feedbacks, only: [:index, :destroy] do 
+    resources :feedbacks, only: [:index, :destroy] do
       get :new_history, on: :member
       post :create_history, on: :member
     end