Merge remote-tracking branch 'origin/main'

This commit is contained in:
李东云
2022-12-19 15:58:19 +08:00

View File

@@ -33,11 +33,11 @@ class Grayscale extends JsonResource
public function toArray(): array
{
return [
'id' => $this->id,
'nameZh' => $this->nameZh,
'nameEn' => $this->nameEn,
'path' => $this->path,
'pathPreview' => $this->pathPreview,
'id' => $this->id ?? $this->resource['id'],
'nameZh' => $this->nameZh ?? $this->resource['nameZh'],
'nameEn' => $this->nameEn ?? $this->resource['nameEn'],
'path' => $this->path ?? $this->resource['path'],
'pathPreview' => $this->pathPreview ?? $this->resource['pathPreview'],
];
}
}