Merge branch 'dev_aliyun' into dev_local

app/services/admins/import_user_service.rb

@@ -46,6 +46,7 @@ class Admins::ImportUserService < ApplicationService
     department = school.departments.find_by(name: data.department_name)
 
     attr = {
+      type: 'User',
       status: User::STATUS_ACTIVE,
       login: "#{prefix}#{data.student_id}",
       firstname: '',