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

疯狂的狮子li

2020-06-01 2e37fe9bc9999918cbd3d36905a96a7add8e7c51

 ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java

@@ -196,6 +196,7 @@
            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
            {
                importList.add("java.util.Date");
                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
            }
            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
            {