From e5a96bc789ca0252e31fd2e01bec5e471a02c0d6 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期四, 22 五月 2025 17:57:29 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsStandardProcessRouteHeaderJob.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsStandardProcessRouteHeaderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsStandardProcessRouteHeaderJob.java index 8544716..7706315 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsStandardProcessRouteHeaderJob.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsStandardProcessRouteHeaderJob.java @@ -36,14 +36,14 @@ private String version; /** 鐢熸晥鏃ユ湡 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Schema(description = "鐢熸晥鏃ユ湡") private Date startDate; /** 澶辨晥鏃ユ湡 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Schema(description = "澶辨晥鏃ユ湡") private Date endDate; -- Gitblit v1.9.3