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/AdminArticleDto.java

@@ -11,8 +11,11 @@
    @ApiModelProperty(value = "标题", example = "文章")
    private String title;

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

    @ApiModelProperty(value = "所属栏目ID", example = "2")
    private Long columnId;
    private String columnIdStr;

    @ApiModelProperty(value = "每页条数", example = "10")
    private Integer pageSize;