Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

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

@@ -30,4 +30,12 @@
                                  @Param("sensor") String sensor,
                                  @Param("startTime") String startTime,
                                  @Param("endTime") String endTime);
    List<Map> getDataByMacAndTime1(@Param("mac") String mac,
                                  @Param("sensor") String sensor,
                                  @Param("startTime") String startTime,
                                  @Param("endTime") String endTime);

    List<Map<String,Object>> getDataAvbByMIdAndTime( @Param("mId")String mId,
                                                     @Param("startTime")String startTime,
                                                     @Param("endTime")String endTime);
}