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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

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

@@ -8,4 +8,6 @@
    //aqi数据按国控站接入
    void insertHistoryAqi();

    HistoryAqi getHistoryApiByTimeAndGuid(String guid,String time);

}