Merge remote-tracking branch 'origin/master'

zengh

2021-03-11 a67506723c8c8e6f0d223b864eaa69423a2710a8

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -59,6 +59,11 @@
   }

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

   @Override
   public void updateOne(Equipment equipment) {
      baseMapper.updateOne(equipment);
   }