Merge remote-tracking branch 'upstream/master'

fungleo

2020-08-04 107672419e484d7893ecf624d4af2101cc72d890

 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;