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

cjl

2023-09-28 10b5e4880762d517c857ae76b098b8749a261fb0

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

@@ -70,8 +70,8 @@

    @GetMapping("insertHistoryAqi")
    @ApiOperation(value = "过控制战补偿", notes = "过控制战补偿")
    public ResultMessage insertHistoryAqi() {
        historyAqiService.insertHistoryAqi();
    public ResultMessage insertHistoryAqi(String time) {
        historyAqiService.insertHistoryAqi(time);
        return new ResultMessage();
    }