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

疯狂的狮子Li

2021-12-15 9e5b64e1b75ff8969e840011aced580c93721a20

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