Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 136750119bcab23b45f1b3a12838943a02e5f536

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/service/impl/AlarmServiceImpl.java

@@ -141,4 +141,9 @@
      //返回数据
      return null;
   }

   @Override
   public List queryPolice() {
      return baseMapper.queryPolice();
   }
}