From fe98fba5b51ae4f1ef62cbdbd9b6a8ec20e8e623 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 12 七月 2022 18:01:56 +0800
Subject: [PATCH] !527 调增数组格式声明，random随机转换修正 Merge pull request !527 from 靖少毅/jsy20220705
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 9fb64da..a57529b 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,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
/**
@@ -57,11 +59,6 @@
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
/**
- * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
- */
- public ColumnType cellType() default ColumnType.STRING;
-
- /**
* 瀵煎嚭鏃跺湪excel涓瘡涓垪鐨勯珮搴� 鍗曚綅涓哄瓧绗�
*/
public double height() default 14;
@@ -107,9 +104,19 @@
public boolean isStatistics() default false;
/**
- * 瀵煎嚭瀛楁瀵归綈鏂瑰紡锛�0锛氶粯璁わ紱1锛氶潬宸︼紱2锛氬眳涓紱3锛氶潬鍙筹級
+ * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
*/
- public Align align() default Align.AUTO;
+ public ColumnType cellType() default ColumnType.STRING;
+
+ /**
+ * 瀵煎嚭瀛椾綋棰滆壊
+ */
+ public IndexedColors color() default IndexedColors.BLACK;
+
+ /**
+ * 瀵煎嚭瀛楁瀵归綈鏂瑰紡
+ */
+ public HorizontalAlignment align() default HorizontalAlignment.CENTER;
/**
* 鑷畾涔夋暟鎹鐞嗗櫒
--
Gitblit v1.9.3