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

zengh

2021-02-03 5a90071cd2797bcacc286fcad31a8b0b0875d6aa

 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);
   }