From dae6e068207ad1bff32dafd8c71f12d8a2a59aa2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期一, 15 四月 2024 16:21:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java index 3ef2d72..a81d902 100644 --- a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java +++ b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java @@ -75,9 +75,9 @@ @ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true,dataTypeClass = Integer.class), @ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true,dataTypeClass = Integer.class) }) - public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) { + public TableDataInfo selectAlarmList(String name,Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) { startPage(); - Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize); + Object alarmList = globalAlarmService.selectAlarmList(name,command,beginTime,endTime, pageNum, pageSize); return getDataTable((List)alarmList); } -- Gitblit v1.9.3