From 5159c394abba56caa446005e1b32c64fda1bcd67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E7=9D=BF?= <237453939@qq.com>
Date: Mon, 17 Aug 2020 17:33:50 +0800
Subject: [PATCH] =?UTF-8?q?excel=E6=B3=A8=E8=A7=A3=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/annotation/Excel.java     | 5 +++++
 1 file changed, 5 insertions(+)

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 2735b9711..4c05b38d2 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
@@ -84,6 +84,11 @@ public @interface Excel
      */
     public boolean isExport() default true;
 
+    /**
+     * 是否合并.
+     */
+    public boolean isMerge() default true;
+
     /**
      * 另一个类中的属性名称,支持多级获取,以小数点隔开
      */