From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git

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

diff --git a/src/main/java/com/moral/common/util/ReportTimeFormat.java b/src/main/java/com/moral/common/util/ReportTimeFormat.java
index 2ada48b..b61944b 100644
--- a/src/main/java/com/moral/common/util/ReportTimeFormat.java
+++ b/src/main/java/com/moral/common/util/ReportTimeFormat.java
@@ -121,7 +121,6 @@
          cal.set(toCalendarTimeUnit(timeUnits), value);
          return cal.getTime();
      }
-
      private static int toCalendarTimeUnit(TimeUnits timeUnits) {
            switch (timeUnits) {
                case YEAR: return  Calendar.YEAR;

--
Gitblit v1.8.0