From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |    1 +
 1 files changed, 1 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 add1279..3c1c89e 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1117,6 +1117,7 @@
         return todayStart.getTime().getTime();
     }
 
+
     public static Integer getTodayInt() {
         return (int) (getTodayTime() / 1000);
     }

--
Gitblit v1.8.0