Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

 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);
}