Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-22 3271a0e7421aa7c55f475be8f24ad85b576108b8

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