Merge remote-tracking branch 'origin/master'

Administrator

2021-04-23 0b9ceeec9c387b1499486468779b5c67bec00113

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

@@ -97,8 +97,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 securityArr) {
      baseMapper.updateJtype(id,jtype,bz,securityArr);
   }

   @Override