Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

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

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

}