Merge remote-tracking branch 'origin/master'

zengh

2021-03-12 70f01fd17bb642c2f773d5c5567018d7573a2dde

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

@@ -54,4 +54,9 @@

   List<Map<String, Object>> selectScount(String time);

   /**
    * 查询警情总数
    * @return
    */
    Integer selectAlarmCount();
}