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

疯狂的狮子li

2020-08-07 a9f4a4e11136334b7828cb98a0cd2066bb0f74d4

 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;