From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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