From 940bdec33a4c2a6b52d1497e6eeffddb1b6b4585 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期五, 18 四月 2025 19:17:25 +0800
Subject: [PATCH] Merge pull request #73 from zhitan-cloud/develop1.0
---
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