From 57c8c3c1fd6bd32be6256529210e7818bc25cf6e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 11 Jul 2023 13:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' 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