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

cjl

2023-08-23 5f7d27060aeca3f23737db21e06fc07c8e28f1a8

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

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

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