From ad86486285cb865f124e5c83cdaf8fa8edc65408 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 30 八月 2024 21:45:16 +0800
Subject: [PATCH] update sqlkeyword
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index c6c8bc5..0d69d39 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -59,12 +59,12 @@
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/**
- * 导出时在excel中每个列的高度 单位为字符
+ * 导出时在excel中每个列的高度
*/
public double height() default 14;
/**
- * 导出时在excel中每个列的宽 单位为字符
+ * 导出时在excel中每个列的宽度
*/
public double width() default 16;
@@ -87,6 +87,11 @@
* 设置只能选择不能输入的列内容.
*/
public String[] combo() default {};
+
+ /**
+ * 是否从字典读数据到combo,默认不读取,如读取需要设置dictType注解.
+ */
+ public boolean comboReadDict() default false;
/**
* 是否需要纵向合并单元格,应对需求:含有list集合单元格)
@@ -114,7 +119,7 @@
public ColumnType cellType() default ColumnType.STRING;
/**
- * 导出列头背景色
+ * 导出列头背景颜色
*/
public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
@@ -124,7 +129,7 @@
public IndexedColors headerColor() default IndexedColors.WHITE;
/**
- * 导出单元格背景色
+ * 导出单元格背景颜色
*/
public IndexedColors backgroundColor() default IndexedColors.WHITE;
@@ -171,7 +176,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.2