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

app/views/shixuns/shixun_list.json.jbuilder

@@ -10,7 +10,7 @@ json.shixun_list do
     # json.description highlights.values[0,5].each { |arr| arr.is_a?(Array) ? arr.join('...') : arr }.join('<br/>')
     json.content highlights
     json.level level_to_s(obj.trainee)
-    json.subjects obj.subjects do |subject|
+    json.subjects obj.subjects.uniq do |subject|
      json.(subject, :id, :name)
    end
   end