From e786a67b2c51ea8c12d06e660a78410e073476d5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 21 十月 2024 16:28:39 +0800
Subject: [PATCH] 优化身份证脱敏正则
---
src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 4ee9565..86ae10c 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/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 {};
+
+ /**
+ * 鏄惁浠庡瓧鍏歌鏁版嵁鍒癱ombo,榛樿涓嶈鍙�,濡傝鍙栭渶瑕佽缃甦ictType娉ㄨВ.
+ */
+ 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.3