Merge remote-tracking branch 'origin/master'

Administrator

2021-03-02 a644c4bb75b173d14fad9ed7dc7cf85c41d4953a

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

@@ -47,6 +47,8 @@
    */
   List<EquipmentVOS> tree();

   List<EquipmentVO> listAll();

   /**
    * 懒加载部门列表
    * @param parentId