From c966d9bada8e189f0beb4867fce81ae73f3fcebd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 02 八月 2020 18:31:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

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

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 9ce5aca..eed41a2 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
@@ -40,6 +40,11 @@
     public String readConverterExp() default "";
 
     /**
+     * 鍒嗛殧绗︼紝璇诲彇瀛楃涓茬粍鍐呭
+     */
+    public String separator() default ",";
+
+    /**
      * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
      */
     public ColumnType cellType() default ColumnType.STRING;

--
Gitblit v1.9.3