From 10b5e4880762d517c857ae76b098b8749a261fb0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 14:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
index 1956563..3f3e335 100644
--- a/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
+++ b/screen-api/src/main/java/com/moral/api/service/AlarmInfoService.java
@@ -42,5 +42,14 @@
       *@Date: 2021/11/12 9:47
      **/
     Map<String, Object> alarmReminder(Map<String,Object> parameters);
+    
+    /**
+      *@Description: ������������������������������������
+      *@Param: [parameters]
+      *@return: java.util.Map<java.lang.String,java.lang.Object> 
+      *@Author: lizijie
+      *@Date: 2022/1/4 14:49
+     **/
+    Map<String, Object> alarmReminderByMonitorPointIds(Map<String, Object> parameters);
 
 }

--
Gitblit v1.8.0