Merge branch 'master-测试2' into master-测试1

# Conflicts:
#	src/main/java/com/example/math/controller/OperateController.java

src/main/java/com/example/math/controller/OperateController.java

@@ -1126,8 +1126,7 @@ public class OperateController {
             //负载枚举值 镜头负载
             data.put("hsi_frequency", 1);
 
-
-            System.out.printf("我是测试2号啊 啦啦啦啦");
+            System.out.printf("我是测试1号啊 哈哈哈");
 
             //Broker 连接信息
             Map<String,Object> mqttBroker = new HashMap<>();