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-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
index 1e26f86..4d2c776 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
@@ -57,10 +57,7 @@
@GetMapping("/list")
public TableDataInfo list(JkHistoryAlarm jkHistoryAlarm)
{
- startPage();
- List<JkHistoryAlarm> list = historyAlarmService.selectHistoryAlarmPageList(jkHistoryAlarm);
-// Page<JkHistoryAlarm> list = historyAlarmService.selectJkHistoryAlarmPage(jkHistoryAlarm);
- return getDataTable(list);
+ return getDataTable(historyAlarmService.selectHistoryAlarmPageList(jkHistoryAlarm));
}
/**
* 瀵煎嚭鍘嗗彶鎶ヨ鐩戞帶鍒楄〃
--
Gitblit v1.9.3