excel注解加入合并属性

2020-08-17 17:33:50 +08:00 · 2020-08-17 17:33:50 +08:00 · 5159c394ab
parent ba2494ce7f
commit 5159c394ab
1 changed files with 5 additions and 0 deletions
--- 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;
+
    /**
     * 另一个类中的属性名称,支持多级获取,以小数点隔开
     */