Merge remote-tracking branch 'origin/master'

jinpengyong

2021-10-12 f060b03b65806b8ab1b869459942fa1f20641c9b

 src/main/java/com/moral/service/impl/WeatherServiceImpl.java

@@ -348,7 +348,7 @@
        RestTemplate restTemplate = new RestTemplate();
        c.setTime(new Date());
        Date endTime = sdf.parse(sdf.format(c.getTime()));
        c.add(Calendar.MONTH, -2);
        c.add(Calendar.MONTH, -1);
        Date startTime = sdf.parse(sdf.format(c.getTime()));
        int state = 200;
        List<Map<String, Object>> cityList = weatherMapper.getCityWeatherConfig();