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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

 screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java

@@ -8,7 +8,7 @@
public interface HistoryAqiService extends IService<HistoryAqi> {

    //aqi数据按国控站接入
    void insertHistoryAqi();
    void insertHistoryAqi(String time1);

    HistoryAqi getHistoryApiByTimeAndGuid(String guid,String time);