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

疯狂的狮子li

2020-06-18 8d318c222ede0dcc587ac1177c2e4900e609151e

 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()))
            {