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

manailin

2021-08-20 51508c8c63bb072739a0e3ae45cb11e7599c8f66

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/AppletUserInfoVO.java

@@ -129,4 +129,13 @@
    @ApiModelProperty("钱包结算金额")
    private BigDecimal settlementAmount;

    @ApiModelProperty("积分总余额")
    private Integer integralSum;

    @ApiModelProperty("积分可用余额")
    private Integer integralAvailableSum;

    @ApiModelProperty("积分冻结金额")
    private Integer integralFrozenSum;

}