From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java b/cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java
index 8124433..22e6e1b 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/GetHistoryDto.java
@@ -15,6 +15,5 @@
     private String pleasePic;
     private String passPic;
     private String createBy;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date date;
 }

--
Gitblit v1.7.1