From c0d430f4e5adf08129c2610d9d2b5446bb19c0d6 Mon Sep 17 00:00:00 2001 From: XCSDN <gitee@xcsdn.net> Date: 星期四, 07 四月 2022 12:57:56 +0800 Subject: [PATCH] update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. 字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成 防止由于字典类型不符合前端开发规范而报错 --- ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 13 ++++++++++++- 1 files changed, 12 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 50482c5..9fb64da 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 @@ -5,6 +5,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.math.BigDecimal; +import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; /** * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ @@ -108,7 +109,17 @@ /** * 瀵煎嚭瀛楁瀵归綈鏂瑰紡锛�0锛氶粯璁わ紱1锛氶潬宸︼紱2锛氬眳涓紱3锛氶潬鍙筹級 */ - Align align() default Align.AUTO; + public Align align() default Align.AUTO; + + /** + * 鑷畾涔夋暟鎹鐞嗗櫒 + */ + public Class<?> handler() default ExcelHandlerAdapter.class; + + /** + * 鑷畾涔夋暟鎹鐞嗗櫒鍙傛暟 + */ + public String[] args() default {}; public enum Align { -- Gitblit v1.9.3