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

xiaoyong931011

2022-07-07 795084c308a27601e3a50280f9c0919adf87e32a

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

@@ -99,6 +99,8 @@
    @TableField(exist = false)
    private List<Long> columnIds;
    @TableField(exist = false)
    private List<Long> columnlist;
    private List<Long> columnList;
    @TableField(exist = false)
    private String timeType;

}