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

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

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

@@ -15,5 +15,11 @@
   List<String> selectNextLevelRegion(Map<String, Object> parameters);



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

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



   Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);

	
   Map<String, Object> getAVGValueByMacAndTimeslot(@Param("mac")String mac, @Param("starttime")String starttime, @Param("endtime")String endtime);



}