Merge branch 'develop' into standalone_develop

This commit is contained in:
2022-04-28 10:54:02 +08:00
6 changed files with 39 additions and 31 deletions

View File

@@ -313,6 +313,7 @@ class UsersController < ApplicationController
:occupation, :technical_title,
:school_id, :department_id, :province, :city,
:custom_department, :identity, :student_id, :description,
:show_super_description, :super_description,
:show_email, :show_location, :show_department]
)
end