Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

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

@@ -156,4 +156,9 @@
   public List<Map<String, Object>> queryPoliceTime(List policeIdArr) {
      return baseMapper.queryPoliceTime(policeIdArr);
   }

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