From ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 22:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/controller/Dashboard.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/Dashboard.java b/src/main/java/com/moral/monitor/controller/Dashboard.java
index 024b9e6..eff59a3 100644
--- a/src/main/java/com/moral/monitor/controller/Dashboard.java
+++ b/src/main/java/com/moral/monitor/controller/Dashboard.java
@@ -357,7 +357,7 @@
for (History a:historys){
String format = sdf.format(a.getTime());
xtime.add(format);
- yvalue.add(a.getMacValue());
+ yvalue.add(a.getMac_value());
}
s.put("xtime",xtime);
s.put("yvalue",yvalue);
--
Gitblit v1.8.0