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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletRankingVO.java

@@ -13,9 +13,15 @@
    @ApiModelProperty("钱包id")
    private Long id;

    @ApiModelProperty("姓名")
    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("姓名")
    private String userName;

    @ApiModelProperty("用户头像")
    private String imageUrl;

    @ApiModelProperty("收益总金额")
    private BigDecimal incomeAmount;