Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng

KKSU

2024-09-30 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5

 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 Long columnId;
    private String columnIdStr;

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