weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'update' (#38) from zhangwei into dev 

Reviewed-on: #38
This commit is contained in:
weiz 2023-12-04 15:03:06 +08:00
parent 19363319cf 650ff4d5ba
commit 4767ae58c6
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/ActionController.php
View File

@ -121,8 +121,6 @@
} }
$data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->order('create_time desc')->select()->each(function($item){ $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['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; return $item;
})->toArray(); })->toArray();
return $this->success('请求成功',$data); return $this->success('请求成功',$data);