From 64c7668818aa8272c0aae206a3c0f7007ca38e5d Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 60a46f4..4a46064 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -204,7 +204,7 @@
// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
long diff = endDate.getTime() - nowDate.getTime();
// 璁＄畻宸灏戠//杈撳嚭缁撴灉
- long sec = diff % nd % nh % nm / ns;
+ long sec = diff/ ns;
return sec;
}
}
--
Gitblit v1.9.3