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

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

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

@@ -98,5 +98,9 @@
    private String path;
    @TableField(exist = false)
    private List<Long> columnIds;
    @TableField(exist = false)
    private List<Long> columnList;
    @TableField(exist = false)
    private String timeType;

}