Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

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

@@ -43,4 +43,6 @@
   String getJsonData(@Param("mac") String mac,

                  @Param("time") String time,

                  @Param("table") String table);



   Map<String,Object> getDailyAvgData(@Param("mId")String mId,@Param("time")String time);

}