From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/utils/Date.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Date.java b/server/service/src/main/java/com/doumee/core/utils/Date.java
index 73310aa..b35f2db 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Date.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Date.java
@@ -20,6 +20,9 @@
* @return java.util.Date
*/
public java.util.Date getStart (java.util.Date date) {
+ if(date == null){
+ return null;
+ }
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.set(Calendar.HOUR_OF_DAY, 0);
--
Gitblit v1.9.3