Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/shop-service into develop

app/Http/Controllers/V1/ShopController.php

@@ -48,7 +48,7 @@ class ShopController extends Controller {
             return $this->jsonError($validator->errors()->first());
         }
 
-        $shop = Shop::whereIn('shop_id',explode(',',$data['ids']))->where('status',0)->pluck('shop_name','shop_id');
+        $shop = Shop::whereIn('shop_id',explode(',',$data['ids']))->where('status',1)->pluck('shop_name','shop_id');
         if($shop){
             return $this->jsonSuccess($shop);
         }else{