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

# Conflicts: # src/main/java/com/example/math/controller/OperateController.java
大疆demo提交4
2025-09-23 11:19:04 +08:00 · 2025-09-23 11:18:38 +08:00 · 2025-09-23 11:17:18 +08:00
1 changed files with 2 additions and 0 deletions
--- a/src/main/java/com/example/math/controller/OperateController.java
+++ b/src/main/java/com/example/math/controller/OperateController.java
@ -1126,6 +1126,8 @@ public class OperateController {
            //负载枚举值 镜头负载
            data.put("hsi_frequency", 1);

+            System.out.printf("我是测试1号啊 哈哈哈");
+
            //Broker 连接信息
            Map<String,Object> mqttBroker = new HashMap<>();
            //服务器连接地址
Author	SHA1	Message	Date
chenlu	9141480766	Merge branch 'master-测试2' into master-测试1 # Conflicts: # src/main/java/com/example/math/controller/OperateController.java	2025-09-23 11:19:04 +08:00
chenlu	bd2419fa04	大疆demo提交4	2025-09-23 11:18:38 +08:00
chenlu	5ba0a8bab6	大疆demo提交3	2025-09-23 11:17:18 +08:00