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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/ComActIntegralCommunityRankDTO.java

@@ -20,6 +20,9 @@
    @ApiModelProperty("身份类型（1.全部 2.居民 3.志愿者 4.党员）")
    private Integer type = 1;

    @ApiModelProperty("变动类型（1.增加  2.减少）")
    private Integer changeType;

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