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

xiaoyong931011

2022-07-05 e703d415ff36584518a76d4d26363bfd1556b43b

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

@@ -43,6 +43,9 @@
    // 目标类型 1-链接到文章 2-链接到栏目 3-外部链接
    private Integer targetType;

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

    // 目标地址 (外部地址http/https开头 文章ID/栏目ID)
    private String targetUrl;