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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-job/src/main/java/com/moral/api/controller/PubController.java

@@ -75,6 +75,12 @@
        return new ResultMessage();
    }

    @GetMapping("insertHCHistoryAqi")
    @ApiOperation(value = "海城省控", notes = "海城省控")
    public ResultMessage insertHCHistoryAqi() {
        historyAqiService.insertHCHistoryAqi();
        return new ResultMessage();
    }
    @GetMapping("dateToChangShu")
    @ApiOperation(value = "常熟小时数据", notes = "常熟小时数据")
    public ResultMessage dateToChangShu() {