Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

Merge remote-tracking branch 'origin/master'

 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;