Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-05-14 16f354ea88bb4671650a547550b0a4d38f7af6eb

 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);