From 16f44651a78d00943aea51b26fc6a4f20518a648 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jan 2021 16:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 3899bb0..13201eb 100644
--- a/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
+++ b/src/main/java/org/springblade/modules/equipment/service/IEquipmentService.java
@@ -45,7 +45,13 @@
 
 	void updateOne(Equipment equipment);
 
+	void updateClinent(Equipment equipment);
+
 	void s(Equipment equipment);
+
+	void updataType(String arr);
+
+	void updataTypeC(String arr);
 
 	/**
 	 * 懒加载
@@ -66,4 +72,5 @@
 	 * @return
 	 */
 	List<EquipmentVOS> selectList(String deviceType);
+	void updateChannel(String heartbeat,String deviceNumber);
 }

--
Gitblit v1.9.3