From c38f066ac66f90e5da16593c9bc09a495b2cabfb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Mar 2021 15:16:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
index 7aca03d..158a589 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java
@@ -34,8 +34,8 @@
*/
public interface IEquipmentService extends IService<Equipment> {
- IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment);
-
+ IPage<EquipmentVO> selectEquipmentPage(IPage<EquipmentVO> page, EquipmentVO equipment,List childList);
+ IPage<EquipmentVO> selectPage(IPage<EquipmentVO> page, EquipmentVO equipment,String pid);
/**
* 树形结构
*
@@ -43,6 +43,8 @@
*/
List<EquipmentVOS> tree();
+ List<EquipmentVO> listAll();
+
void updateOne(Equipment equipment);
void s(Equipment equipment);
--
Gitblit v1.9.3