Merge remote-tracking branch 'origin/develop' into develop

app/Http/Controllers/V1/ShopController.php

@@ -29,7 +29,7 @@ class ShopController extends Controller {
         }
         $res['data']  = Shop::where('shop_id',$data['id'])->first();
         if($res){
-            return $this->jsonSuccess(['data'=>$res]);
+            return $this->jsonSuccess($res);
         }else{
             return $this->jsonError('获取失败');
         }