Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-job/src/main/java/com/moral/api/service/impl/CityWeatherServiceImpl.java

@@ -45,6 +45,7 @@
    @Autowired
    private RedisTemplate redisTemplate;

    //城市气象数据来源于，和风天气，实时天气商业版
    @Override
    public void insertCityWeather() {
        //获取城市配置