|
@@ -188,7 +188,12 @@ class BookController extends BaseController
|
|
}
|
|
}
|
|
return $item;
|
|
return $item;
|
|
});
|
|
});
|
|
|
|
+<<<<<<< HEAD
|
|
// $user = (new QappUserService)->getGolableUser();
|
|
// $user = (new QappUserService)->getGolableUser();
|
|
|
|
+=======
|
|
|
|
+ $user = (new QappUserService)->getGolableUser();
|
|
|
|
+ if(isset($user->uid) && !empty($user->uid)){
|
|
|
|
+>>>>>>> dd0b5be4b77a37d19725667dad0cdf401d8f7c16
|
|
|
|
|
|
if($this->user_info){
|
|
if($this->user_info){
|
|
|
|
|