From 96475892e9dd469603fc2ad4c79add18b8c2c5ff Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Fri, 22 Aug 2025 14:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crm/service/FollowService.php        | 6 ++----
 app/crmAdmin/service/CustomerService.php | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/crm/service/FollowService.php b/app/crm/service/FollowService.php
index e8ec322..a433692 100644
--- a/app/crm/service/FollowService.php
+++ b/app/crm/service/FollowService.php
@@ -60,10 +60,8 @@ class FollowService
         }
         $follow['picture_full'] = $oss_picture;
 
-//        $follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
-        $follow['follow_time'] = empty($follow['follow_time'])?'':date('Y-m-d H:i:s', $follow['follow_time']);
-        $follow['created_at'] = empty($follow['created_at'])?'':date('Y-m-d H:i:s', $follow['created_at']);
-        $follow['updated_at'] = empty($follow['updated_at'])?'':date('Y-m-d H:i:s', $follow['updated_at']);;
+        $follow = Util::formatDate($follow,['created_at','updated_at','follow_time']);
+        $follow['follow_time'] = empty($follow['follow_time'])?'':$follow['follow_time'];
 //        $follow = Util::formatDate($follow);
         return $follow;
     }
diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php
index 20f4137..ad51d80 100644
--- a/app/crmAdmin/service/CustomerService.php
+++ b/app/crmAdmin/service/CustomerService.php
@@ -470,9 +470,7 @@ class CustomerService
         $ossservice = new OssService();
         foreach ($follow as $item) {
             $item = Util::formatDate($item,['created_at','updated_at','follow_time']);
-            $item['follow_time'] = empty($item['follow_time'])?'':date('Y-m-d H:i:s', $item['follow_time']);
-            $item['created_at'] = empty($item['created_at'])?'':date('Y-m-d H:i:s', $item['created_at']);
-            $item['updated_at'] = empty($item['updated_at'])?'':date('Y-m-d H:i:s', $item['updated_at']);;
+            $item['follow_time'] = empty($item['follow_time'])?'':$item['follow_time'];
             $item['picture_full'] = empty($item->picture)?'':$ossservice->generatePrivateUrl($item->picture);
         }