Merge remote-tracking branch 'origin/cms' into anentang

KKSU

2024-01-11 69830f1a3b084ad6800c8013268624a11d7fa5f3

 src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminSeeColumnInfoVo.java

@@ -43,7 +43,16 @@
    @ApiModelProperty(value = "目标地址")
    private String targetUrl;

    @ApiModelProperty(value = "目标描述")
    private String targetName;

    @ApiModelProperty(value = "是否为导航 1-是 2-否")
    private Integer isNav;

    @ApiModelProperty(value = "内容类型 1：文章 2：图片 3：文件 4：音频")
    private Integer contentType;

    @ApiModelProperty(value = "栏目地址")
    private String url;

}