Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-24 75b7365399fd87efb8691c909aedb5503b03ccc8

 febs-server/febs-server-generator/src/main/java/cc/mrbird/febs/server/generator/helper/GeneratorHelper.java

@@ -53,7 +53,8 @@
        data.put("hasDate", false);
        data.put("hasBigDecimal", false);
        columns.forEach(c -> {
            c.setField(FebsUtil.underscoreToCamel(StringUtils.lowerCase(c.getName())));
            // c.setField(FebsUtil.underscoreToCamel(StringUtils.lowerCase(c.getName())));
            c.setField(c.getName());
            if (StringUtils.containsAny(c.getType(), FieldType.DATE, FieldType.DATETIME, FieldType.TIMESTAMP)) {
                data.put("hasDate", true);
            }