Merge remote-tracking branch 'origin/master'

Administrator

2021-04-23 0b9ceeec9c387b1499486468779b5c67bec00113

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

@@ -52,6 +52,8 @@

   void updateOne(Equipment equipment);

   void saveImg(EquipmentVO equipment);

   void s(Equipment equipment);

   void updataType(String arr);