Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

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

@@ -10,4 +10,7 @@
    List<Sensor> selectByVersionId(Integer deviceVersionId);

   List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
	
    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);

}