Merge remote-tracking branch 'origin/master'

zengh

2021-05-19 977444532d644d48b5b55ca89a1e3d62b5dd8782

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

@@ -410,4 +410,14 @@
   public List<ReportReturnData> getAlarmPie(AlarmVO alarmVO) {
      return baseMapper.getAlarmPie(alarmVO);
   }

   /**
    * 查询未处理及处理中的警情总数量
    * @param deviceNumber 设备编号
    * @return
    */
   @Override
   public Integer selectEqCount(String deviceNumber) {
      return baseMapper.selectEqCount(deviceNumber);
   }
}