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

Helius

2022-07-05 03123e40dfda2aca60201e026b40503a5c3ac892

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

@@ -81,6 +81,9 @@

    private String articleUrl;

    //内容类型 1：文章 2：图片 3：文件 4：音频"
    private Integer contentType;

    @TableField(exist = false)
    private String columnCode;