From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
index 67b7316..37cae41 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -34,7 +34,7 @@
*/
public interface IEquipmentService extends IService<Equipment> {
- List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
+ List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate);
/**
* 树形结构
@@ -57,6 +57,7 @@
List<EquipmentVOS> lazyList(Long parentId, Map<String, Object> param);
EquipmentVOS selectInfo(Equipment equipment);
+ List<Map<String, Object>> selectInfos(String deviceNumber);
/**
* 设备列表
--
Gitblit v1.9.3