Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -10,4 +10,10 @@
   String selectValueByMacAndTime(@Param("mac")String mac, @Param("time")Date time);

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



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



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



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



}