# Conflicts: # maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java # maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java
# Conflicts: # maibu-common/src/main/java/com/maibu/mqtt/HostMessageHandler.java # maibu-netty-server/src/main/java/com/maibu/service/DeviceThreadService.java