Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

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

@@ -34,7 +34,7 @@
 */
public interface EquipmentMapper extends BaseMapper<Equipment> {

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

   void s(Equipment equipment);
   void updateOne(Equipment equipment);
@@ -47,6 +47,8 @@
    */
   List<EquipmentVOS> tree();

   List<EquipmentVO> listAll();

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