From c38f066ac66f90e5da16593c9bc09a495b2cabfb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Mar 2021 15:16:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index d07ebca..726417f 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -95,7 +95,7 @@
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入alarm")
 	public R<List> listAll() {
-		List pages = alarmService.list();
+		List pages = alarmService.listAll();
 		return R.data(pages);
 	}
 

--
Gitblit v1.9.3