Merge remote-tracking branch 'origin/develop' into standalone_develop

# Conflicts:
#	app/views/users/get_user_info.json.jbuilder

app/queries/admins/user_query.rb

@@ -19,6 +19,9 @@ class Admins::UserQuery < ApplicationQuery
     status = params[:status]
     users = users.where(status: status) if status.present?
 
+    # 是否管理员
+    users = users.where(admin: params[:admin]) if params[:admin].present?
+
     # 职业
     users = users.joins(:user_extension).where(user_extensions: { identity: params[:identity] }) if params[:identity].present?