Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-17 8052d759570bcf6a01aac55733365c8c306623a4

 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -196,7 +196,7 @@
    public static boolean isSuperColumn(String tplCategory, String javaField) {
        if (isTree(tplCategory)) {
            return StringUtils.equalsAnyIgnoreCase(javaField,
                    ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
                ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
        }
        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
    }