From d30a6450c9a3ddfa4886e840939d37daab766a9b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Thu, 12 Mar 2026 22:22:10 +0800
Subject: [PATCH] !450 update docker image version for master branch Merge pull request !450 from magic/fix/docker
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 841e712..f16c3ed 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -16,6 +16,7 @@
*
* @author ruoyi
*/
+@SuppressWarnings("deprecation")
public class DateUtils extends org.apache.commons.lang3.time.DateUtils
{
public static String YYYY = "yyyy";
@@ -137,9 +138,17 @@
}
/**
+ * 计算相差天数
+ */
+ public static int differentDaysByMillisecond(Date date1, Date date2)
+ {
+ return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
+ }
+
+ /**
* 计算时间差
*
- * @param endTime 最后时间
+ * @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差（天/小时/分钟）
*/
--
Gitblit v1.9.3