Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 136750119bcab23b45f1b3a12838943a02e5f536

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

@@ -72,4 +72,6 @@
    * @return
    */
   List<Map<String,Object>> selectAlarmSum(ConditionVo conditionVo);

   List queryPolice();
}