Merge branch 'feature/merge' into develop

This commit is contained in:
2025-12-04 14:35:03 +08:00
+1
View File
@@ -50,6 +50,7 @@ class UserService
'email' => $user->email, 'email' => $user->email,
'status' => $user->status, 'status' => $user->status,
'roles' => $user->roles->pluck('name'), 'roles' => $user->roles->pluck('name'),
'roles_id' => $user->roles->pluck('id'),
'sex' => $user->sex, 'sex' => $user->sex,
'sn' => $user->sn, 'sn' => $user->sn,
'corp_id' => $user->corp_id, 'corp_id' => $user->corp_id,