Merge branch 'master' of http://git.9026.com/wesley/furniture

app/Http/Controllers/Api/V1/AlbumController.php

@@ -2248,8 +2248,9 @@ class AlbumController extends Controller
             if(!$goods){
                 unset($res[$key]);continue;
             }
-            dd($res);
+
             $res[$key]['name'] = $goods->name;
+            dd($res);
             $res[$key]['count'] = AlbumFavoriteModel::whereIn('user_id',$users)->where([['store_id',$store_id],['product_id',$val['product_id']]])->count();
         }
         return $this->api($res,0,'success');