Merge remote-tracking branch 'origin/master' into test

# Conflicts:
#	device-api/src/main/java/com/xy/service/DeviceMqttConsumer.java

device-api/src/main/java/com/xy/service/DeviceMqttConsumer.java

@@ -38,5 +38,5 @@ public interface DeviceMqttConsumer {
 
     @PostMapping("deviceFault")
     void deviceFault(@RequestBody @Validated DeviceMqttDto.RequestParams requestParams);
- 
+
 }