Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

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

@@ -20,6 +20,6 @@
   
    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
    
    Map<String,Object> getSensorBySensorKey(@Param("sensorKey")String sensorKey);
    Map<String,Object> getSensorBySensorKey(@Param("sensor_key")String sensor_key);

}