Merge remote-tracking branch 'origin/master'

钟日健

2021-02-24 c302589567b7b556d8dfd7fca8cf3cf215d1a390

 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);
   }