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

manailin

2021-08-04 df654c8bbe24a659833d436a2e7e2013e3592142

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java

@@ -31,4 +31,7 @@

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

    @ApiModelProperty("排序（1.升序 2.降序）")
    private Integer sort;
}