From 12ea7330bac0a43818b8ec3a8601119dd609dfb9 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 18 四月 2025 22:43:12 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems

---
 zhitan-system/src/main/java/com/zhitan/alarm/services/IHistoryAlarmService.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/alarm/services/IHistoryAlarmService.java b/zhitan-system/src/main/java/com/zhitan/alarm/services/IHistoryAlarmService.java
index bc6792f..78e58ec 100644
--- a/zhitan-system/src/main/java/com/zhitan/alarm/services/IHistoryAlarmService.java
+++ b/zhitan-system/src/main/java/com/zhitan/alarm/services/IHistoryAlarmService.java
@@ -32,12 +32,10 @@
 
   void updateHistoryAlarm(String alarmCode, HistoryAlarm historyAlarm);
 
-  Page<JkHistoryAlarm> selectJkHistoryAlarmPage(JkHistoryAlarm jkHistoryAlarm, Long pageNum, Long pageSize);
-
   /**
    * 鍘嗗彶鎶ヨ鍒嗛〉鏌ヨ
    * @param jkHistoryAlarm
    * @return
    */
-  List<JkHistoryAlarm> selectHistoryAlarmPageList(JkHistoryAlarm jkHistoryAlarm);
+  Page<JkHistoryAlarm> selectHistoryAlarmPageList(JkHistoryAlarm jkHistoryAlarm);
 }

--
Gitblit v1.9.3