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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 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);



}