From fa5596bb2091089fb69a99f38d794a490734180e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 22 Aug 2020 13:18:41 +0800
Subject: [PATCH] Editor组件优化，支持自定义高度&图片冲突问题
---
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 eed41a2..f781b1e 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
@@ -4,6 +4,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.math.BigDecimal;
/**
* 自定义导出Excel数据注解
@@ -30,7 +31,7 @@
public String dateFormat() default "";
/**
- * 如果是字典类型，请设置字典的type值
+ * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
*/
public String dictType() default "";
@@ -45,6 +46,16 @@
public String separator() default ",";
/**
+ * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
+ */
+ public int scale() default -1;
+
+ /**
+ * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
+ */
+ public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+
+ /**
* 导出类型（0数字 1字符串）
*/
public ColumnType cellType() default ColumnType.STRING;
--
Gitblit v1.9.2