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

jinpengyong

2023-09-06 e2411fee13ff406db4aa5d994d7dcffdf4482cab

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