From bba9c294f4b5750a6680091ca4e044803b7bf10e Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Wed, 20 Aug 2025 13:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crm/controller/CustomerController.php  | 1 +
 app/ticket/model/Conversation.php          | 6 +-----
 app/ticket/service/ConversationService.php | 2 ++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php
index f391abd..7d05d44 100644
--- a/app/crm/controller/CustomerController.php
+++ b/app/crm/controller/CustomerController.php
@@ -50,6 +50,7 @@ class CustomerController extends BaseController
                 : null);
             foreach ($data['records'] as &$item) {
                 $item = $this->service->getCustomer($item);
+                $item = Util::formatDate($item,['created_at','updated_at']);
             }
             return $this->success($data);
         } catch (\Throwable $e) {
diff --git a/app/ticket/model/Conversation.php b/app/ticket/model/Conversation.php
index f275f2b..641ff35 100644
--- a/app/ticket/model/Conversation.php
+++ b/app/ticket/model/Conversation.php
@@ -20,11 +20,7 @@ class Conversation extends Model
     protected $primaryKey = 'id';
     public $timestamps = true;
     protected $dateFormat = 'U';
-    protected $dates = ['created_at', 'updated_at'];
-    protected $casts = [
-        'updated_at' => 'datetime:Y-m-d H:i:s',
-        'created_at' => 'datetime:Y-m-d H:i:s',
-    ];
+
     protected $fillable = [
         'ticket_id',
         'user_id',
diff --git a/app/ticket/service/ConversationService.php b/app/ticket/service/ConversationService.php
index 22da6fb..05158c8 100644
--- a/app/ticket/service/ConversationService.php
+++ b/app/ticket/service/ConversationService.php
@@ -35,6 +35,8 @@ class ConversationService
             $user = User::where('id', $value['user_id'])->first();
             $value['user_name'] = $user?->name;
             $value['user_avatar'] = $user?->avatar;
+            $value['created_at'] = date('Y-m-d H:i:s', strtotime($value['created_at']));
+            $value['updated_at'] = date('Y-m-d H:i:s', strtotime($value['updated_at']));
             $result[$key] = $value;
         }
         return $result;