Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-22 e8242c8c4b69a52bd49fd0b5b49333e1d227e405

 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();
    }