From 84fd4e4fcb9e0862e1d6bd2a7c1f3110cfe72652 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 13 十一月 2024 09:12:20 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 5ca5eba..c03cf47 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
@@ -1283,6 +1283,9 @@
      * @return
      */
     public static Date getXMinuteAfterDate(Date date, int minute) {
+        if(date ==null){
+            date = new Date();
+        }
         Calendar now = Calendar.getInstance();
         now.setTime(date);
         now.set(Calendar.MINUTE, now.get(Calendar.MINUTE) + minute);

--
Gitblit v1.9.3