Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

app/controllers/shixuns_controller.rb

@@ -461,7 +461,7 @@ class ShixunsController < ApplicationController
 		limit = params[:limit] || 10
 		data_sets = @shixun.data_sets
 		@data_count = data_sets.count
-		@data_sets= data_sets.page(page).per(limit)
+		@data_sets= data_sets.order("created_on desc").page(page).per(limit)
 		@absolute_folder = edu_setting('shixun_folder')
 	end