Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/admins/competition_settings_controller.rb

@@ -1,5 +1,5 @@
 class Admins::CompetitionSettingsController < Admins::BaseController
-  def show
+  def index
     @competition = current_competition
   end
 

app/services/competitions/create_personal_team_service.rb

@@ -20,7 +20,7 @@ class Competitions::CreatePersonalTeamService < ApplicationService
     raise Error, '您已报名该竞赛' if enrolled && multiple_limited
 
     ActiveRecord::Base.transaction do
-      team = competition.competition_teams.create!(name: user.show_name, user_id: user.id)
+      team = competition.competition_teams.create!(name: user.real_name, user_id: user.id)
       team.team_members.create!(competition_id: competition, user_id: user.id, role: 1, is_teacher: is_teacher)
     end
   end

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

@@ -10,7 +10,9 @@
     <span class="flex-1">基础设置</span>
   </div>
   <div class="card-body row">
+    <div class="container">
 
+    </div>
   </div>
 </div>
 

config/routes.rb

@@ -787,7 +787,7 @@ Rails.application.routes.draw do
       resources :competitions, only: [:index, :show, :update] do
         resources :competition_modules, only: [:index, :show, :update]
         resource :competition_staff
-        resources :competition_teams, only: [:index, :show] do
+        resources :competition_teams, only: [:index, :show, :create, :update] do
           post :join, on: :collection
           post :leave, on: :member
           get :course_detail, on: :member