Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

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

@@ -74,4 +74,8 @@
    * @return
    */
    List<Map<String, Object>> selectAlarmSum(@Param("conditionVo") ConditionVo conditionVo);

   List<Map<String, Object>> queryPolice();

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