Merge remote-tracking branch 'origin/master' into master

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

 src/main/java/org/springblade/modules/alarm/service/impl/AlarmServiceImpl.java

@@ -84,8 +84,8 @@
   }

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

}