From eb489bda83b8049808ea54450a2e15e384c32a34 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 16 Dec 2025 13:44:16 +0800
Subject: [PATCH] 升级commons.io到最新版本2.21.0
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
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 70368ab..ee44abb 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
@@ -79,6 +79,11 @@
public String prompt() default "";
/**
+ * 是否允许内容换行
+ */
+ public boolean wrapText() default false;
+
+ /**
* 设置只能选择不能输入的列内容.
*/
public String[] combo() default {};
@@ -166,7 +171,7 @@
public enum ColumnType
{
- NUMERIC(0), STRING(1), IMAGE(2);
+ NUMERIC(0), STRING(1), IMAGE(2), TEXT(3);
private final int value;
ColumnType(int value)
--
Gitblit v1.9.3