Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 cfe8e9eb93657a1300d1c9acd2e844525785321c

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

@@ -87,6 +87,8 @@

   List<Map<String, Object>> getAlarm(AlarmVO alarmVO);

   boolean setAlarm(AlarmVO alarmVO);

   /**
    * 查询当前时间段一键求助报警总次数
    * @param conditionVo
@@ -135,4 +137,5 @@
    * @return
    */
   List<ReportReturnData> getAlarmPie(AlarmVO alarmVO);

}