From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
index f157cb0..73e1f3d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
@@ -48,7 +48,7 @@
@ApiOperation(value="告警记录-自定义分页列表查询", notes="告警记录-自定义分页列表查询")
@GetMapping(value = "/page")
public R selectAlarmPage(AlarmRecordVO alarmRecord, Query query) {
- return R.data( alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
+ return R.data(alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
}
/**
--
Gitblit v1.9.3