Conflicts: iot-platform/src/main/java/com/iot/platform/mqtt/MqttDynamicConsumer.java iot-platform/src/main/java/com/iot/platform/service/TdEngineService.java