From f34a510629676ebf22d75bde2e89e2fe4a2f56be Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:52 +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, 4 insertions(+), 0 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 24eb001..4279cc1 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
@@ -47,6 +47,8 @@
 	 */
 	List<EquipmentVOS> tree();
 
+	List<EquipmentVO> listAll();
+
 	/**
 	 * 懒加载部门列表
 	 * @param parentId
@@ -64,4 +66,6 @@
 	EquipmentVOS selectInfo(Equipment equipment);
 	List<Map<String, Object>> selectInfos(String deviceNumber);
 	void updateChannel(String heartbeat, String deviceNumber);
+	void updateexpireTime(String expireTime, String deviceNumber);
+	void updateExstate(String state,String reason, String deviceNumber);
 }

--
Gitblit v1.9.3