Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

 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);
}