Merge remote-tracking branch 'origin/master'

zengh

2021-04-07 f14966e7c0338b4c749fee51c73470ca0230f163

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

@@ -91,4 +91,11 @@
    * @return
    */
   Integer selAlarmTimeCount(@Param("conditionVo") ConditionVo conditionVo);

   /**
    * 查询当前时间段内一键求助报警的数据集合
    * @param conditionVo
    * @return
    */
   List<Alarm> selectAlarmList(@Param("conditionVo")ConditionVo conditionVo);
}