Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-07-23 e19e2fd9cc472f9a2c115fe8e794c3f0df468eac

 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 "";