Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop

app/controllers/users_controller.rb

@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   end
 
   def list
-    scope = User.active.recent.like(params[:search]).includes(:user_extension)
+    scope = User.active.like(params[:search]).includes(:user_extension).order(nickname: :desc, last_login_on: :desc)
     @total_count = scope.size
     @users = paginate(scope)
   end