Merge remote-tracking branch 'origin/master'

tangzy

2021-03-20 e0d1a9a05fee8ef75ce8f5bd7107be32ec8c8e82

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

@@ -98,8 +98,8 @@
   }

   @Override
   public void updateJtype(String id,String jtype,String bz) {
      baseMapper.updateJtype(id,jtype,bz);
   public void updateJtype(String id,String jtype,String bz,String jjtime) {
      baseMapper.updateJtype(id,jtype,bz,jjtime);
   }

   @Override