From 2a4a9ef52b0d76efb9712fd8d4268f658546f99f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 19 Oct 2023 16:31:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/mapper/AlarmInfoMapper.java | 5 +++++
1 files changed, 5 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 43131d0..30512db 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
@@ -2,6 +2,7 @@
import com.moral.api.entity.AlarmInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -19,6 +20,10 @@
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);
+ int numNews(@Param("organizationId") int organizationId);
+
}
--
Gitblit v1.8.0