Merge remote-tracking branch 'origin/master'
# Conflicts: # fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
This commit is contained in:
commit
a9dde2c96b
# Conflicts: # fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java