From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index d6a03cb..add1279 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -103,6 +103,7 @@
         cal.setTime(date);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -118,6 +119,7 @@
         cal.setTime(date);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -167,6 +169,7 @@
         cal.set(Calendar.HOUR_OF_DAY,0);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -187,6 +190,7 @@
         cal.set(Calendar.HOUR_OF_DAY,23);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -204,6 +208,7 @@
         cal.set(Calendar.HOUR_OF_DAY,0);
         cal.set(Calendar.MINUTE,0);
         cal.set(Calendar.SECOND,0);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 
@@ -221,6 +226,7 @@
         cal.set(Calendar.HOUR_OF_DAY,23);
         cal.set(Calendar.MINUTE,59);
         cal.set(Calendar.SECOND,59);
+        cal.set(Calendar.MILLISECOND,0);
         return cal.getTime();
     }
 

--
Gitblit v1.8.0