From d78f6422011f9cf04bd70e28949fa91e467623a5 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期三, 05 八月 2020 10:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
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