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

疯狂的狮子li

2022-01-04 92653f3deb3f0f03ee9bfef3e9322fb94c90938c

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