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

@@ -15,7 +15,7 @@
    private Integer contentType;

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

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