Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java

@@ -80,6 +80,7 @@
        Map<Integer,List<SensorUnit>> resultListMap = new HashMap<>();
        for(Integer sensorId: sensorIds) {
            sensorUnitQuery.setSensorId(sensorId);
            sensorUnitQuery.setIsDelete(false);
            List<SensorUnit> sensorUnitList = sensorUnitMapper.select(sensorUnitQuery);
            if(sensorUnitList!=null&&sensorUnitList.size()>0){
                resultListMap.put(sensorId,sensorUnitList);