From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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