Merge remote-tracking branch 'origin/master'

钟日健

2021-02-24 c302589567b7b556d8dfd7fca8cf3cf215d1a390

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

@@ -43,6 +43,11 @@
   }

   @Override
   public List<AlarmVO> listAll() {
      return baseMapper.listAll();
   }

   @Override
   public List<AlarmVO> selectList(String jtype,String district,String waringType,String beginTime,String endTime) {
      return baseMapper.selectList(jtype,district,waringType,beginTime,endTime);
   }