From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 03 一月 2024 11:43:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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