From e4ccbc66010f7c26ea4b014fe6199b41dd9667af Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 07 十一月 2024 22:15:27 +0800
Subject: [PATCH] 支持自定义显示Excel属性列
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 d534a3e..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
@@ -89,6 +89,11 @@
public String[] combo() default {};
/**
+ * 是否从字典读数据到combo,默认不读取,如读取需要设置dictType注解.
+ */
+ public boolean comboReadDict() default false;
+
+ /**
* 是否需要纵向合并单元格,应对需求:含有list集合单元格)
*/
public boolean needMerge() default false;
@@ -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