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

cjl

2023-09-06 d50faa74719f4d3f18ec9f99d99483f2c119c3a0

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

@@ -39,7 +39,7 @@
    @XxlJob("insertHistoryAqi")
    public ReturnT insertHistoryAqi() {
        try {
            historyAqiService.insertHistoryAqi();
            historyAqiService.insertHistoryAqi(null);
        } catch (Exception e) {
            XxlJobHelper.log(e.getMessage());
            return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());