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

lizijie

2021-11-29 d8310f6bc609440fa352c0e5a9436c7c78caa287

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