From c2ff461ff0ec168868c5f8b2138043e294d59a81 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 16 Dec 2025 13:44:40 +0800
Subject: [PATCH] 升级fastjson到最新版2.0.60
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 10f9a91..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
@@ -54,12 +54,12 @@
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/**
- * 导出时在excel中每个列的高度 单位为字符
+ * 导出时在excel中每个列的高度
*/
public double height() default 14;
/**
- * 导出时在excel中每个列的宽 单位为字符
+ * 导出时在excel中每个列的宽度
*/
public double width() default 16;
@@ -77,6 +77,11 @@
* 提示信息
*/
public String prompt() default "";
+
+ /**
+ * 是否允许内容换行
+ */
+ public boolean wrapText() default false;
/**
* 设置只能选择不能输入的列内容.
@@ -109,7 +114,7 @@
public ColumnType cellType() default ColumnType.STRING;
/**
- * 导出列头背景色
+ * 导出列头背景颜色
*/
public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
@@ -119,7 +124,7 @@
public IndexedColors headerColor() default IndexedColors.WHITE;
/**
- * 导出单元格背景色
+ * 导出单元格背景颜色
*/
public IndexedColors backgroundColor() default IndexedColors.WHITE;
@@ -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