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; + /** * 另一个类中的属性名称,支持多级获取,以小数点隔开 */