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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

 screen-job/src/main/java/com/moral/api/task/AqiInsertTask.java

@@ -30,6 +30,11 @@
    @Autowired
    private CityAqiYearlyService cityAqiYearlyService;

    @XxlJob("insertHistoryAqisss")
    public ReturnT insertHistoryAqisss() {
       System.out.println("已执行job");
        return ReturnT.SUCCESS;
    }
    //国控站aqi小时数据接入
    @XxlJob("insertHistoryAqi")
    public ReturnT insertHistoryAqi() {