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

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

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