From 70696d2382879b823b40d6ff978dad6b30b4d80c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 06 七月 2023 22:14:52 +0800
Subject: [PATCH] update sql
---
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 8fdf7c1..6534960 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;
@@ -89,6 +89,11 @@
public String[] combo() default {};
/**
+ * 鏄惁闇�瑕佺旱鍚戝悎骞跺崟鍏冩牸,搴斿闇�姹�:鍚湁list闆嗗悎鍗曞厓鏍�)
+ */
+ public boolean needMerge() default false;
+
+ /**
* 鏄惁瀵煎嚭鏁版嵁,搴斿闇�姹�:鏈夋椂鎴戜滑闇�瑕佸鍑轰竴浠芥ā鏉�,杩欐槸鏍囬闇�瑕佷絾鍐呭闇�瑕佺敤鎴锋墜宸ュ～鍐�.
*/
public boolean isExport() default true;
@@ -104,12 +109,12 @@
public boolean isStatistics() default false;
/**
- * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
+ * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓� 2鍥剧墖锛�
*/
public ColumnType cellType() default ColumnType.STRING;
/**
- * 瀵煎嚭鍒楀ご鑳屾櫙鑹�
+ * 瀵煎嚭鍒楀ご鑳屾櫙棰滆壊
*/
public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
@@ -119,7 +124,7 @@
public IndexedColors headerColor() default IndexedColors.WHITE;
/**
- * 瀵煎嚭鍗曞厓鏍艰儗鏅壊
+ * 瀵煎嚭鍗曞厓鏍艰儗鏅鑹�
*/
public IndexedColors backgroundColor() default IndexedColors.WHITE;
--
Gitblit v1.9.3