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

app/AdminAgent/Controllers/WorkorderController.php

@@ -151,7 +151,7 @@ class WorkorderController extends AdminController
 			return $this->error('上传图片格式错误');
 		}
 
-		$path = $request->image->store('images/workorder');
+		$path = $request->image->store('public/images/workorder');
 		return $this->jsonSuccess(['path' => config('filesystems.disks.public.url') . '/' . $path]);
 	}
 
@@ -190,6 +190,7 @@ class WorkorderController extends AdminController
 			return $this->jsonFailValidated('数据不全：'.$validator->errors()->first());
 		}
 		$data = WorkorderItem::query()
+			->with('publisher')
 			->where('workorder_id',request('workorder_id',0))
 			->orderBy('created_at')
 			->get();

app/Models/Workorder.php

@@ -22,4 +22,9 @@ class Workorder extends Model
 	{
 		return $this->morphTo();
 	}
+
+	public function items()
+	{
+		return $this->hasMany(WorkorderItem::class,'workorder_id','id');
+	}
 }

app/Models/WorkorderItem.php

@@ -13,4 +13,8 @@ class WorkorderItem extends Model
 
     protected $table = 'workorder_item';
 
+	public function publisher()
+	{
+		return $this->morphTo();
+	}
 }