From a4d1e11a3ee5739d0f3089c53510baad571d9427 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 19 十月 2023 19:50:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java index f1549e1..fcd0897 100644 --- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java +++ b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java @@ -29,19 +29,19 @@ */ private static final long serialVersionUID = 1L; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date registerTime; @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date userBirthday; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date fullWeightTime; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date emptyWeightTime; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date completeTime; private List<FileData> files;//鎻愪氦鐨勭浉鍏抽檮浠朵俊鎭紝渚嬪鐓х墖銆� -- Gitblit v1.9.3