From 0643375523b3d409ddae4ad698cd14d5eb087f4c Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 02 二月 2026 14:01:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java
index 79fc51b..41b0144 100644
--- a/zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java
+++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/common/DateUtils.java
@@ -77,6 +77,10 @@
return Math.abs(date2.getTime() - date1.getTime())/1000;
}
+ public static long diffToMilliseconds(Date date1, Date date2) {
+ return Math.abs(date2.getTime() - date1.getTime());
+ }
+
private static int getDaysByTimestamp(long timestamp){
double daysPoint = Arith.divides(2, timestamp, (1000 * 3600 * 24));
int daysPoint1 = (int) daysPoint;
--
Gitblit v1.9.1