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

疯狂的狮子li

2021-07-27 06944747fd52b98f21337274678325ff62d10beb

 ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -149,7 +149,7 @@


    public enum ColumnType

    {

        NUMERIC(0), STRING(1);

        NUMERIC(0), STRING(1), IMAGE(2);

        private final int value;



        ColumnType(int value)