Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

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

@@ -143,7 +143,12 @@
   }

   @Override
   public List queryPolice() {
   public List<Map<String, Object>> queryPolice() {
      return baseMapper.queryPolice();
   }

   @Override
   public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
      return baseMapper.queryPoliceTime(policeIdArr);
   }
}