From a7f017adfb5ec73abf83f73108220e2665208fdc Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 19 十月 2023 10:43:32 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java index faadb29..fdee4ed 100644 --- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java +++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java @@ -3011,7 +3011,7 @@ * @return */ public static Integer betweenMin(Date begin, Date end) { - if(begin ==null || end == null){ + if(begin ==null ){ return 0; } long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑 -- Gitblit v1.9.3