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

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

 src/main/java/com/xcong/farmer/cms/modules/system/dto/AdminUpdateColumnDto.java

@@ -46,4 +46,10 @@

    @ApiModelProperty(value = "目标地址")
    private String targetUrl;

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

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