Merge branch 'master' into test

sys-api-service/src/main/java/com/xy/config/WebMqttConfig.java

@@ -10,7 +10,6 @@ import java.util.List;
 @Component
 @ConfigurationProperties(prefix = "web.mqtt")
 public class WebMqttConfig {
-
     /**
      * ip
      */