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

xiaoyong931011

2022-07-08 7ed2efc56e0bd3965388f97f9a2db350f6e4e382

 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;