Merge remote-tracking branch 'origin/master'

沈斌

2017-11-07 ba9a621c55f520be8e26cdb0d3ad61b5246b2fc1

 src/main/java/com/moral/monitor/listener/Listener.java

@@ -228,7 +228,7 @@
        List<Sensor> sensors = taskDao.selectFromsensorByver(ver);

        Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();

        for (Sensor sensor : sensors) {

            ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());

            ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());

        }

        return ex_sensorMap;

    }