From 16f354ea88bb4671650a547550b0a4d38f7af6eb Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 14 May 2024 14:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
index e9d86c9..4476327 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
@@ -75,7 +75,7 @@
 
 //                actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(quotient-1).getDkbh()));
                 // 设置媒体文件名称后缀
-                actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(pointPO.getIndex()).getDkbh()));
+                actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(pointPO.getIndex()).getDkbh() + "~" + lotInfos.get(pointPO.getIndex()).getTaskId()));
 //                actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto("测试"));
                 list.add(actionMode);
 

--
Gitblit v1.9.3