Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleDetailAppDTO.java

@@ -16,16 +16,16 @@
    @ApiModelProperty("邻里圈id")
    private Long circleId;

    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;

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

    @ApiModelProperty(value = "评论分页-每页记录数",example = "10")
    @ApiModelProperty(value = "评论分页-每页记录数", example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty(value = "评论排序方式（1.倒序 2.顺序）",example = "10")
    @ApiModelProperty(value = "评论排序方式（1.倒序 2.顺序）", example = "10")
    private Integer order = 1;

}