Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

tangzy

2021-03-12 dd202fbaa4caea48aa5a0df620b87a6e41dba429

 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();
}