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/impl/EquipmentServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
index f35fceb..5013454 100644
--- a/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipment/service/impl/EquipmentServiceImpl.java
@@ -47,7 +47,7 @@
private static final String PARENT_ID = "parentId";
@Override
- public List<EquipmentVO> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
+ public List<Equipment> selectEquipmentPage(String deviceName, String addvcd, String dtype, String devicestate) {
return baseMapper.selectEquipmentPage(deviceName,addvcd,dtype,devicestate);
}
@@ -87,6 +87,11 @@
}
@Override
+ public List<Map<String, Object>> selectInfos(String deviceNumber) {
+ return baseMapper.selectInfos(deviceNumber);
+ }
+
+ @Override
public List<EquipmentVOS> selectList(String deviceType) {
return baseMapper.selectList(deviceType);
}
--
Gitblit v1.9.3