Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-05 cee43c11fe6772305e19e7ddee1e8276060046d6

 src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java

@@ -91,6 +91,11 @@
    @TableField(exist = false)
    private String columnName;

    /**
     * 栏目目录
     */
    @TableField(exist = false)
    private String path;
    @TableField(exist = false)
    private List<Long> columnIds;