Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

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

@@ -36,6 +36,8 @@

   List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);

   List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList);

   void s(Equipment equipment);
   void updateOne(Equipment equipment);
   void updataType(String arr);