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

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

@@ -486,4 +486,5 @@
       </div>
     </div>
   </div>
+  <div style="margin-bottom: 8.5rem;"></div>
 <% end %>

public/react/src/modules/competition/comcss/competition.css

@@ -221,13 +221,13 @@
 .registbut111 p {
     width: 100%;
     height: 100%;
-    line-height: 41px;
+    line-height: 38px;
 }
 
 .registbut222 p {
     width: 100%;
     height: 100%;
-    line-height: 41px;
+    line-height: 38px;
 
 }