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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

 screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java

@@ -5,6 +5,7 @@

import com.moral.api.entity.HistoryFiveMinutely;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.pojo.dto.Wind.WindData;

/**
@@ -19,4 +20,8 @@

    List<WindData> getAreaWindData(Map<String, Object> params);

    List<HistoryFiveMinutely> listResult(Map<String, Object> params);

    List<HistoryFiveMinutely> listResultOne(Map<String, Object> params);

}