Merge remote-tracking branch 'origin/master'

doum

14 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/IntegralDataResponse.java

@@ -26,4 +26,13 @@
    @ApiModelProperty(value = "积分说明")
    private String info;

    @ApiModelProperty(value = "已提现余额")
    private BigDecimal withdrawAmount;

    @ApiModelProperty(value = "待结算余额")
    private BigDecimal waitPayAmount;

    @ApiModelProperty(value = "提现中余额")
    private BigDecimal withdrawIngAmount;

}