From 8568fc09c464606bd96bcc74c2c58faae99803b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 10 四月 2025 14:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
index fd47a38..54526f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/WordUtil.java
+++ b/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()) {
--
Gitblit v1.7.1