From 8555acdb7e8ff8349f848c7529c83c8d2d4493b6 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 23 Mar 2023 13:52:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Resources/AgriculturalBaseResource.php | 2 +- app/Models/AgriculturalBase.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Resources/AgriculturalBaseResource.php b/app/Http/Resources/AgriculturalBaseResource.php index ed81589..c95a933 100644 --- a/app/Http/Resources/AgriculturalBaseResource.php +++ b/app/Http/Resources/AgriculturalBaseResource.php @@ -30,7 +30,7 @@ class AgriculturalBaseResource extends JsonResource 'devices' => DeviceResource::collection($this->whenLoaded('devices')), 'parent_id' => $this->parent_id ?? 0, 'sort' => $this->sort ?? 0, - 'extends' => json_decode($this->extends ?? []), + 'extends' => json_decode($this->extends ?? '') ?? [], ]; } } diff --git a/app/Models/AgriculturalBase.php b/app/Models/AgriculturalBase.php index 8ed4314..4155031 100644 --- a/app/Models/AgriculturalBase.php +++ b/app/Models/AgriculturalBase.php @@ -13,7 +13,6 @@ class AgriculturalBase extends Model protected $casts = [ 'type' => BaseType::class, - // 'extends' => 'array', ]; protected $fillable = [