Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/shixuns_controller.rb

@@ -830,8 +830,6 @@ private
 	def is_shixun_reset?(games, min_challenges, current_myshixun)
 		# 用户在申请发布之前，是否玩过实训 TODO: 重置的字段应该迁移到myshixuns表比较合适
 		modify_shixun = ShixunModify.exists?(:myshixun_id => current_myshixun.id, :shixun_id => @shixun.id, :status => 1)
-		games.size != min_challenges.size ||
+		games.size != min_challenges.size || modify_shixun
-				games.map(&:challenge_id) != min_challenges.map{|challenge| challenge.first} ||
-				modify_shixun
 	end
 end