Merge branch 'feature/crmAdmin0717' into develop
This commit is contained in:
@@ -63,7 +63,7 @@ class UserService
|
|||||||
'country_id' => $user->country_id,
|
'country_id' => $user->country_id,
|
||||||
'country_txt' => Country::where('id',$user->country_id)->value('cn_addr'),
|
'country_txt' => Country::where('id',$user->country_id)->value('cn_addr'),
|
||||||
'avatar' => $user->avatar,
|
'avatar' => $user->avatar,
|
||||||
'avatar_full' => (!empty($user->avatar))?$ossservice->generatePrivateUrl($user->avatar):'',
|
'avatar_full' => $user->avatar,
|
||||||
'phone' => $user->phone,
|
'phone' => $user->phone,
|
||||||
'corp_name' => $corp_name,
|
'corp_name' => $corp_name,
|
||||||
'email' => $user->email,
|
'email' => $user->email,
|
||||||
|
|||||||
Reference in New Issue
Block a user