Merge remote-tracking branch 'origin/master'

jinpengyong

2020-05-21 a46f5f1db19dc1af644a4ed013bb12555621e135

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