From ca657b048275fbac4fd13e3c26808ad20e8ea128 Mon Sep 17 00:00:00 2001
From: fungleo <web@fengcms.com>
Date: 星期日, 26 七月 2020 17:33:42 +0800
Subject: [PATCH] 优化 index-tree.vue.vm 文件，undefined 修改为 null
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 3519791..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
@@ -30,9 +30,19 @@
public String dateFormat() default "";
/**
+ * 如果是字典类型，请设置字典的type值
+ */
+ public String dictType() default "";
+
+ /**
* 读取内容转表达式 (如: 0=男,1=女,2=未知)
*/
public String readConverterExp() default "";
+
+ /**
+ * 分隔符，读取字符串组内容
+ */
+ public String separator() default ",";
/**
* 导出类型（0数字 1字符串）
@@ -115,4 +125,4 @@
return this.value;
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2