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)); } /** * 导出历史报警监控列表
