Merge branch 'yunqi' into stabble

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -1236,7 +1236,9 @@ class ChapterController extends BaseController
         }
 
         if($book_info->is_on_shelf == 10){
+            //Log::info('ddddddddddddddddddddddddddd');
             $yq_book_user = BookUserService::selectUser($this->uid);
+            //Log::info($yq_book_user);
             if($yq_book_user && $yq_book_user->type == 'ENABLE'){
                 return false;
             }