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

lib/tasks/public_message.rake

@@ -54,7 +54,7 @@ namespace :sync do
     end
 
     if subject_id.to_i == -1
-      discusses = Shixun.where("parent_id is null and dis_id=?", shixun_id)
+      discusses = Discuss.where("parent_id is null and dis_id=?", shixun_id)
     else
       shixun_ids = Shixun.find_by_sql("select shixun_id from stage_shixuns where stage_id in (select id from stages where
                                      subject_id=#{subject_id}) ").map(&:shixun_id)