Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev
This commit is contained in:
commit
e7e2325a24
@ -255,7 +255,7 @@ class UserController extends BaseApiController
|
|||||||
if($user){
|
if($user){
|
||||||
$user['address_info']=UserAddress::where('uid',$user['id'])->where('is_default',1)->find();
|
$user['address_info']=UserAddress::where('uid',$user['id'])->where('is_default',1)->find();
|
||||||
}
|
}
|
||||||
return $this->success('ok',$user);
|
return $this->success('ok',$user?->toArray());
|
||||||
}
|
}
|
||||||
return $this->success('ok',[]);
|
return $this->success('ok',[]);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user