From ef431a71ed043e8fb63777793df23c110b853803 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
index 2fb7446..7c6d8bf 100644
--- a/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AlarmDailyServiceImpl.java
@@ -146,7 +146,7 @@
for (Sensor sensor : sensors) {
if (!entry.getValue().toString().equals("0") && entry.getKey().equals(sensor.getSensorKey())) {
Map<String, Object> map2 = new HashMap<String, Object>();
- map2.put(sensor.getName(), entry.getValue());
+ map2.put(sensor.getDescription(), entry.getValue());
resultList.add(map2);
sensors.remove(sensor);
break;
--
Gitblit v1.8.0