Merge remote-tracking branch 'origin/master'

jinpengyong

2020-06-03 4f3fd6c40cf8ff706f86363ccd6555164f348d63

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

@@ -11,4 +11,5 @@

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

    void createHistoryMinutelyTable(@Param("yearAndMonth") String yearAndMonth);
}