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

5 years ago · 9fc6161f57
parent b671491b13 1c1db2bd0e
commit 9fc6161f57
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/competitions_controller.rb
+++ b/app/controllers/competitions_controller.rb
@ -322,7 +322,7 @@ class CompetitionsController < ApplicationController
            # 'nyog9r7c','yugrij4n','48flws5g','bfgau7s6','mfv6zrj7','f398leqr','qwaffs2p','ose7482b','y5wh2ofx'
            # 预赛的实训id  第一阶段：1185，1197，1195  第二阶段：1202, 1210, 1207  第三阶段：1254，1255，1243
            shixun1_id = [2303]
-            shixun2_id = [2994, 3012, 3014]
+            shixun2_id = [2994, 3012, 3024]
            shixun3_id = [2944, 2938, 2943]
          elsif @type == "决赛"
            # '92b7vt8x','a7fxenvc','wt2xfzny','xa4m9cng','tng6heyf','am5o73er','9fla2zry','fzp3iu4w','qlsy6xb4'