From 3ca67e4cdb5d3291d780e28ceaf6a20d3cc8f596 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 18 Sep 2026 09:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/common/core/annotation/Excel.java   | 2 +-
 ...ictDataConverter​.java => ExcelDictDataConverter.java} | 2 +-
 .../java/com/ruoyi/common/core/utils/poi/ExcelUtil.java     | 6 +++---
 .../ruoyi/common/security/utils/poi/DictDataConverter.java  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/{ExcelDictDataConverter​.java => ExcelDictDataConverter.java} (94%)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
index 1a0f9ddee..225b3e4ad 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -120,7 +120,7 @@ public @interface Excel
     public boolean isStatistics() default false;
 
     /**
-     * 导出类型（0数字 1字符串）
+     * 导出类型（0数字 1字符串 2图片）
      */
     public ColumnType cellType() default ColumnType.STRING;
 
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter​.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter.java
similarity index 94%
rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter​.java
rename to ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter.java
index 715bcfe1b..e61575736 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter​.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelDictDataConverter.java
@@ -5,7 +5,7 @@ package com.ruoyi.common.core.utils.poi;
  *
  * @author ruoyi
  */
-public interface ExcelDictDataConverter​
+public interface ExcelDictDataConverter
 {
     /**
      * 根据字典类型和字典键值获取字典标签
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
index 034eff78b..e7d7d86bb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -207,7 +207,7 @@ public class ExcelUtil<T>
     /**
      * 字典数据转换器
      */
-    private ExcelDictDataConverter​ dictDataConverter;
+    private ExcelDictDataConverter dictDataConverter;
 
     public ExcelUtil(Class<T> clazz)
     {
@@ -239,13 +239,13 @@ public class ExcelUtil<T>
      *
      * @return 字典数据转换器
      */
-    private ExcelDictDataConverter​ getDictDataConverter()
+    private ExcelDictDataConverter getDictDataConverter()
     {
         if (dictDataConverter == null)
         {
             try
             {
-                dictDataConverter = SpringUtils.getBean(ExcelDictDataConverter​.class);
+                dictDataConverter = SpringUtils.getBean(ExcelDictDataConverter.class);
             }
             catch (Exception e)
             {
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/poi/DictDataConverter.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/poi/DictDataConverter.java
index 044ee2f2f..f667640da 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/poi/DictDataConverter.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/poi/DictDataConverter.java
@@ -3,7 +3,7 @@ package com.ruoyi.common.security.utils.poi;
 import java.util.List;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.poi.ExcelDictDataConverter​;
+import com.ruoyi.common.core.utils.poi.ExcelDictDataConverter;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.system.api.domain.SysDictData;
 
@@ -13,7 +13,7 @@ import com.ruoyi.system.api.domain.SysDictData;
  * @author ruoyi
  */
 @Component
-public class DictDataConverter implements ExcelDictDataConverter​
+public class DictDataConverter implements ExcelDictDataConverter
 {
     /**
      * 分隔符