Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX

tangzy

2021-04-23 8b4825afee9300eee48ffdc61dd87e46f19a1201

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