fixed 合并冲突

config/routes.rb

@@ -24,6 +24,7 @@ Rails.application.routes.draw do
   resources :edu_settings
 
   scope '/api' do
+    resources :topics, only: [:index]
     namespace :ci  do
       resources :languages, only: [:index, :show] do
         collection do
@@ -145,6 +146,16 @@ Rails.application.routes.draw do
           get :get_children_journals
         end
       end
+
+      resources :claims, only: [:index] do
+        collection do
+          post :create
+          delete :destroy
+          get :index
+          put :update
+        end
+      end
+
       resources :issue_times, only: [:create] do
         collection do
           post :end_work
@@ -672,6 +683,16 @@ Rails.application.routes.draw do
   namespace :admins do
     mount Sidekiq::Web => '/sidekiq'
     get '/', to: 'dashboards#index'
+    namespace :topic do
+      resources :activity_forums
+      resources :banners
+      resources :cards
+      resources :cooperators
+      resources :excellent_projects
+      resources :experience_forums
+      resources :pinned_forums
+    end
+
     resources :project_statistics, only: [:index] do
       collection do
         get :visits_static