From a28ca3f36d0ace05966a8c0fac1e4b5fe921f882 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 30 十月 2024 16:25:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java b/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
index cb47d49..bb8f25c 100644
--- a/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
+++ b/iailab-framework/iailab-common/src/main/java/com/iailab/framework/common/util/date/DateUtils.java
@@ -198,7 +198,7 @@
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(startDate);
         while (calendar.getTime().compareTo(endDate) <= 0) {
-            days.add(DateUtils.format(calendar.getTime(), FORMAT_YEAR_MONTH_DAY));
+            days.add(DateUtils.format(calendar.getTime(), FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
             calendar.add(Calendar.SECOND, seconds);
         }
         return days;

--
Gitblit v1.9.3