解决冲突

app/views/admins/user_statistics/index.html.erb

@@ -19,7 +19,6 @@
     <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
     <input type="reset" class="btn btn-secondary clear-btn" value="清空"/>
   <% end %>
-
   <%= javascript_void_link '导出', class: 'btn btn-outline-primary export-action', 'data-url': export_admins_user_statistics_path(format: :xlsx) %>
 </div>
 

config/routes.rb

@@ -911,7 +911,6 @@ Rails.application.routes.draw do
     resources :user_statistics, only: [:index] do
       get :export, on: :collection
     end
-
     resources :library_applies, only: [:index] do
       member do
         post :agree