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

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

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

@@ -49,4 +49,7 @@

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

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