Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 670bc85ba8468dbe9a427abc54f2bca9d4e71749

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

@@ -48,10 +48,12 @@
    */
   List<EquipmentVOS> tree();

   List<EquipmentVO> listAll();
   List<EquipmentVO> listAll(EquipmentVO equipment);

   void updateOne(Equipment equipment);

   void saveImg(EquipmentVO equipment);

   void s(Equipment equipment);

   void updataType(String arr);