From b5a2fc07527ab700544f3b7ba0be01b2e015e2db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 04 Aug 2023 08:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

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

diff --git a/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java b/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
index 308ad08..3771d92 100644
--- a/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
+++ b/screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java
@@ -19,4 +19,8 @@
 
     List<Map<String,Object>> selectDataByCondition(Map<String, Object> map);
 
+    List<Map<String,Object>> selectDataByConditionWithoutPage(Map<String, Object> map);
+
+    List<Map<String,Object>> selectNewestData(Map<String, Object> map);
+
 }

--
Gitblit v1.8.0