From c302589567b7b556d8dfd7fca8cf3cf215d1a390 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 24 Feb 2021 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 464a3b6..aaf6ad2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/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
--
Gitblit v1.9.3