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/ParameterUtils.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/common/util/ParameterUtils.java b/src/main/java/com/moral/common/util/ParameterUtils.java
index 36d4cfb..4052898 100644
--- a/src/main/java/com/moral/common/util/ParameterUtils.java
+++ b/src/main/java/com/moral/common/util/ParameterUtils.java
@@ -70,7 +70,7 @@
parameters.put("typeFormat", "%Y-%m-%d %H");
parameters.put("timeLength", 24);
parameters.put("field", Calendar.DATE);
- parameters.put("timeUnits", "minutely");
+ parameters.put("timeUnits", "hourly");
break;
case "hour":
parameters.put("format", "yyyy-MM-dd HH");
--
Gitblit v1.8.0