From a7eb07c7a0afb7da1eb9eb1bd902b0cec77921e2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 07 八月 2020 16:07:02 +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.2