Merge branch 'feature/user0812' into develop
This commit is contained in:
@@ -133,7 +133,7 @@ class CustomerService
|
|||||||
$item['desc_collect'] = $item['desc_collect'] ?? '';
|
$item['desc_collect'] = $item['desc_collect'] ?? '';
|
||||||
$item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']);
|
$item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']);
|
||||||
if ($seas == 'seas' || $scene == 'seas') {
|
if ($seas == 'seas' || $scene == 'seas') {
|
||||||
$item['seas_time'] = time() - strtotime($item['deleted_at']);
|
$item['seas_time'] = time() - (empty($item['deleted_at'])?strtotime($item['updated_at']):strtotime($item['deleted_at']));
|
||||||
}
|
}
|
||||||
if ($scene == 'audit') { //审核时查询举报人姓名
|
if ($scene == 'audit') { //审核时查询举报人姓名
|
||||||
$customerHis = CustomerHis::where('customer_id', $item->id)->orderBy('id', 'desc')->first(['user_his']);
|
$customerHis = CustomerHis::where('customer_id', $item->id)->orderBy('id', 'desc')->first(['user_his']);
|
||||||
|
|||||||
Reference in New Issue
Block a user