Merge branch 'feature/crmadmin0724'

# Conflicts:
#	app/crmAdmin/service/CustomerService.php
This commit is contained in:
2025-08-07 11:09:18 +08:00
+1
View File
@@ -124,6 +124,7 @@ class CustomerService
if (!$export) {
foreach ($customer as &$item) {
$item = $this->getCustomer($item);
$item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']);
if ($seas == 'seas' || $scene == 'seas') {
$item['seas_time'] = time() - strtotime($item['deleted_at']);
}