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

疯狂的狮子li

2021-12-15 b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0

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

@@ -193,7 +193,7 @@
                // BaseEntity
                "createBy", "createTime", "updateBy", "updateTime",
                // TreeEntity
                "parentName", "parentId", "orderNum");
                "parentName", "parentId");
    }

    public boolean isUsableColumn() {