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

mitao

2025-04-10 8568fc09c464606bd96bcc74c2c58faae99803b7

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

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java

@@ -190,7 +190,7 @@
                    Units.toEMU(60),
                    Units.toEMU(30)
            );
            dataMap.put("picture", xwpfPicture);
            dataMap.put("${picture}", xwpfPicture);

            // 处理段落
            for (XWPFParagraph paragraph : document.getParagraphs()) {