From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index c1c9fdb..88efaf1 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -211,7 +211,7 @@
@GetMapping("month-sensor-average")
public Map<String, Object> getMonthAverageBySensor(HttpServletRequest request) {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- return historyService.getMonthAverageBySensor(parameters);
+ return historyMinutelyService.getMonthAverageBySensor(parameters);
}
@GetMapping("check-activate")
--
Gitblit v1.8.0