Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 670bc85ba8468dbe9a427abc54f2bca9d4e71749

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

@@ -176,6 +176,11 @@
      return baseMapper.queryBa();
   }

   @Override
   public List<Map<String, Object>> getAlarm(AlarmVO alarmVO) {
      return baseMapper.getAlarm(alarmVO);
   }

   /**
    * 查询当前时间段一键求助报警总次数
    * @param conditionVo