From 58f51c889aecd7065a82b99d29b3ef4aee891ec1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/listener/MonitorListener.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/monitor/listener/MonitorListener.java b/src/main/java/com/moral/monitor/listener/MonitorListener.java
index df7c2f5..366c523 100644
--- a/src/main/java/com/moral/monitor/listener/MonitorListener.java
+++ b/src/main/java/com/moral/monitor/listener/MonitorListener.java
@@ -258,7 +258,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
}
return ex_sensorMap;
}
--
Gitblit v1.8.0