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

ZhuDongming

2020-01-09 5fcdc8ba338a9f8730262970547274b0dcfe6b4d

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

@@ -23,4 +23,5 @@
    List<Map<String, Object>> selectLineChartDateByCrieria(@Param("sensorKeys") List<String> sensorKeys, @Param("timePeriod") TimePeriod timePeriod, @Param("dataCondition") DataCondition dataCondition);



    List<Map<String, Object>> getSensorData(Map<String, Object> parameters);



}