Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

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

@@ -48,4 +48,6 @@
                       @Param("table") String table);



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

   Map<String,Object> getDailyAvgDataByMIds(@Param("mIds")String[] mIds,@Param("time")String time);



}