From ad53965626f393e418a06b264a11550539419807 Mon Sep 17 00:00:00 2001
From: CoderKK <mijunl@126.com>
Date: 星期二, 07 一月 2025 11:59:34 +0800
Subject: [PATCH] !634 docs: 修改应用配置文件中的注释错别字 * docs: 修改应用配置文件中的注释错别字

---
 ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java
index bbdaaa1..6b9211b 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java
@@ -21,4 +21,9 @@
 	 */
 	int index() default -1;
 
+    /**
+     * 鍚堝苟闇�瑕佷緷璧栫殑鍏朵粬瀛楁鍚嶇О
+     */
+    String[] mergeBy() default {};
+
 }

--
Gitblit v1.9.3