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

zengh

2021-01-15 16f44651a78d00943aea51b26fc6a4f20518a648

 src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java

@@ -45,6 +45,8 @@

   void updateOne(Equipment equipment);

   void updateClinent(Equipment equipment);

   void s(Equipment equipment);

   void updataType(String arr);