Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -25,4 +25,6 @@
    List<Map<String,Object>> getSensorByDeviceId(@Param("id")String id);

    List<Map<String,Object>> getSensorByMonitorPointId(@Param("monitor_point_id")String monitor_point_id);

    List<Sensor> getSensorsByMac(Map<String, Object> parameters);
}