Merge pull request 'update' (#38) from zhangwei into dev
Reviewed-on: #38
This commit is contained in:
commit
4767ae58c6
|
@ -121,8 +121,6 @@
|
|||
}
|
||||
$data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->order('create_time desc')->select()->each(function($item){
|
||||
$item['detail'] = json_decode($item['detail'],true);
|
||||
$item['create_time'] = date('Y-m-d H:i:s',$item['create_time']);
|
||||
$item['update_time'] = date('Y-m-d H:i:s',$item['update_time']);
|
||||
return $item;
|
||||
})->toArray();
|
||||
return $this->success('请求成功',$data);
|
||||
|
|
Loading…
Reference in New Issue