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-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java index 48f7b3b..6c0d239 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/competition/model/CompetitionUser.java @@ -14,6 +14,6 @@ private String phone; private String idCard; private Integer state; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date insertTime; } -- Gitblit v1.7.1