代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java

@@ -20,10 +20,10 @@
    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty(value = "分页每页数量",example = "10")
    @ApiModelProperty(value = "分页每页数量", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "分页当前记录数",example = "1")
    @ApiModelProperty(value = "分页当前记录数", example = "1")
    private Long pageNum = 1L;

}