From dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 20 五月 2024 11:21:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 0b94829..269002c 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -2849,9 +2849,9 @@
 
     public static void main(String[] args) {
         try {
-            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
-            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
-            System.out.println(daysBetweenDates11(date1,date)+1);
+//            Date date = getISO8601DateByStr("2024-04-15T07:46:36.014+08:00");
+//            Date date1 = getISO8601DateByStr("2024-06-14T08:46:36.014+08:00");
+            System.out.println(DateUtil.afterMinutesDate(-5));
 
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -3108,6 +3108,18 @@
     }
 
     /**
+     * X 鍒嗛挓鍚庢椂闂�
+     * @param minutes
+     * @return
+     */
+    public static Date afterMinutesDate(Date date,Integer minutes){
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.add(Calendar.MINUTE,minutes);
+        return cal.getTime();
+    }
+
+    /**
      * LocalDateTime to date
      * @param now
      * @return

--
Gitblit v1.9.3