Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

9 天以前 33730ba5f81f78bf2c63fa792b6b8e65d94c4ca9

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

@@ -42,6 +42,7 @@
        column.setJavaField(StringUtils.toCamelCase(columnName));

        // 设置默认类型

        column.setJavaType(GenConstants.TYPE_STRING);

        column.setQueryType(GenConstants.QUERY_EQ);



        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))

        {