From 816df6ec0a43ef777e0d4cd0daff61f870626d83 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 05 六月 2025 13:53:12 +0800
Subject: [PATCH] feat(system): 添加节假日管理功能- 新增 SysHolidayController、SysHoliday、SysHolidayMapper、SysHolidayServiceImpl 和 ISysHolidayService 类- 实现节假日信息的增删改查和导出功能 - 添加工作日判断方法 - 新增相关 API 接口
---
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