Merge branch 'feature' into 'dev'

2024/07/09 方案选择ocr编辑后未生效问题修复

See merge request !554

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -2080,8 +2080,9 @@ public class MarkDataServiceImpl implements MarkDataService {
         }
         // 选了ocr+其他
         if (dto.getType().contains("OCR") && dto.getType().size() != 1){
-            dto.getType().remove("OCR");
-            param.put("filterWtype", String.join(",", dto.getType()));
+            List<String> type = new ArrayList<>(dto.getType());
+            type.remove("OCR");
+            param.put("filterWtype", String.join(",", type));
             param.put("ocrType", 3);
         }
         param.put("taskName", dto.getName() + "_" + System.currentTimeMillis());