From 3e1bd8e3bc6c94ed5fc39ee7955a1aef97c68d97 Mon Sep 17 00:00:00 2001 From: fungleo <web@fengcms.com> Date: 星期二, 21 七月 2020 10:18:56 +0800 Subject: [PATCH] 修复 utils/index.js 中不包含 parseTime 函数的 bug --- ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 7 ++++++- 1 files changed, 6 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..9ce5aca 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,6 +30,11 @@ public String dateFormat() default ""; /** + * 濡傛灉鏄瓧鍏哥被鍨嬶紝璇疯缃瓧鍏哥殑type鍊� + */ + public String dictType() default ""; + + /** * 璇诲彇鍐呭杞〃杈惧紡 (濡�: 0=鐢�,1=濂�,2=鏈煡) */ public String readConverterExp() default ""; @@ -115,4 +120,4 @@ return this.value; } } -} +} \ No newline at end of file -- Gitblit v1.9.3