Merge remote-tracking branch 'origin/master'

zengh

2021-04-09 abb5cea60f5a0c8735febd9a5cca5f768114d370

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

@@ -111,4 +111,11 @@
    * @return
    */
   Map<String, Object> selectAlarmTimeData(ConditionVo conditionVo);

   /**
    * 根据编号查询本年所有月份的报警数
    * @param deviceNumber
    * @return
    */
   List<Map<String, Object>> queryYearAlarm(String deviceNumber);
}