From dda4c08d41693d2495a13e7db230c3e9747540de Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期二, 02 九月 2025 10:33:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master --- service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java index e36affa..bf6493e 100644 --- a/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java +++ b/service/src/main/java/com/ruoyi/cwgl/domain/dto/ReturnReportDto.java @@ -1,8 +1,10 @@ package com.ruoyi.cwgl.domain.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.Date; /** * 涓婃姤鍙栧嚭瀹℃牳dto @@ -19,6 +21,7 @@ private String driverCode ; /**鍙告満鍞竴缂栧彿*/ @NotBlank(message = "瀛樺叆鏃堕棿涓嶈兘涓虹┖") - private String saveTime ; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date saveTime ; } -- Gitblit v1.8.0