From f26786e162241b6b803ada6d19d80e1f5fb615e5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 16 Oct 2023 09:36:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java b/screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java
index 2ec37a9..93fdaad 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/HistoryFiveMinutelyMapper.java
+++ b/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);
+
 }

--
Gitblit v1.8.0