From 3b61ed56b03df91c7f3967eb19d370d7df84b1dd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 05 八月 2020 12:56:32 +0800
Subject: [PATCH] 添加获取当前的环境配置方法

---
 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.3