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

app/controllers/shixuns_controller.rb

@@ -363,7 +363,7 @@ class ShixunsController < ApplicationController
 		page  = params[:page]  || 1
 		limit = params[:limit] || 10
 		@member_count = @shixun.shixun_members.count
-		@members = @shixun.shixun_members.includes(:user).page(page).per(limit)
+		@members = @shixun.shixun_members.order("role = 1 desc, created_at asc").includes(:user).page(page).per(limit)
 	end
 
 	def fork_list