From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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