From 0eb327fc2e1902bae76ff09d790fbb7d6ebc4f46 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 01 十二月 2022 16:13:14 +0800
Subject: [PATCH] 升级oshi到最新版本6.3.2
---
src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..4ee9565 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
@@ -89,6 +89,11 @@
public String[] combo() default {};
/**
+ * 鏄惁闇�瑕佺旱鍚戝悎骞跺崟鍏冩牸,搴斿闇�姹�:鍚湁list闆嗗悎鍗曞厓鏍�)
+ */
+ public boolean needMerge() default false;
+
+ /**
* 鏄惁瀵煎嚭鏁版嵁,搴斿闇�姹�:鏈夋椂鎴戜滑闇�瑕佸鍑轰竴浠芥ā鏉�,杩欐槸鏍囬闇�瑕佷絾鍐呭闇�瑕佺敤鎴锋墜宸ュ～鍐�.
*/
public boolean isExport() default true;
@@ -104,7 +109,7 @@
public boolean isStatistics() default false;
/**
- * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
+ * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓� 2鍥剧墖锛�
*/
public ColumnType cellType() default ColumnType.STRING;
--
Gitblit v1.9.3