Merge branch 'jtwy' into dev_New

zss

2026-01-19 d972907df11fa76d5766e9aed7f0d36488310d99

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

        {