Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/java/com/moral/mapper/SensorMapper.java

@@ -4,7 +4,10 @@
import com.moral.entity.Sensor;

import java.util.List;
import java.util.Map;

public interface SensorMapper extends BaseMapper<Sensor> {
    List<Sensor> selectByVersionId(Integer deviceVersionId);

   List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
}