Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

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

@@ -66,4 +66,5 @@
   EquipmentVOS selectInfo(Equipment equipment);
   List<Map<String, Object>> selectInfos(String deviceNumber);
   void updateChannel(String heartbeat, String deviceNumber);
   void updateexpireTime(String expireTime, String deviceNumber);
}