Merge remote-tracking branch 'origin/master'

jinpengyong

2021-10-12 f060b03b65806b8ab1b869459942fa1f20641c9b

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

@@ -27,7 +27,7 @@

    List<Map<String, Object>> getWeatherByHour(Map<String, Object> params);

    List<String> getSampleFromHistoryWeather(Map<String, Object> params);
    List<Map<String,Object>> getSampleFromHistoryWeather(Map<String, Object> params);

    List<String> getSampleFromRealWeather(Map<String, Object> params);
    List<Map<String,Object>> getSampleFromRealWeather(Map<String, Object> params);
}