Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.java

@@ -79,4 +79,6 @@
   List<Map<String, Object>> queryPolice();

   List<Map<String, Object>> queryPoliceTime(List policeIdArr);

   List<Map<String, Object>> queryBa();
}