Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1

# Conflicts:
#	soc-modules/soc-modules-host/src/main/java/com/xunmei/host/iot/service/impl/IotDeviceInfoServiceImpl.java

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -38,7 +38,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.StringJoiner;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/iot/service/impl/IotDeviceInfoServiceImpl.java

@@ -181,7 +181,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
     public void deleteAlarmHostDeviceByToken(String token) {
         UpdateWrapper<IotDeviceInfo> uw = new UpdateWrapper<>();
         uw.lambda().eq(IotDeviceInfo::getIotToken, token);
-        uw.lambda().eq(IotDeviceInfo::getDeviceType, DeviceTypeEnum.ALARM_HOST);
+        uw.lambda().eq(IotDeviceInfo::getDeviceType, DeviceTypeEnum.ALARM_HOST.getCode());
         uw.lambda().set(IotDeviceInfo::getDeleted, 1);
         update(uw);
     }