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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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

@@ -59,8 +59,8 @@
        //获取所有城市aqi小时数据
        QueryWrapper<CityAqi> wrapper = new QueryWrapper<>();
        wrapper.select("city_code", "time", "value")
                .ge("time", DateUtils.dateToDateString(start))
                .lt("time", DateUtils.dateToDateString(end));
                .ge("time", start)
                .lt("time", end);
        List<Map<String, Object>> dailyData = cityAqiService.listMaps(wrapper);

        if (dailyData.size() == 0) {