Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java

@@ -66,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);
}