Merge remote-tracking branch 'origin/master'

doum

昨天 d0da0ce546110de49cca9e0358029a51c53188d6

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

@@ -24,8 +24,6 @@
    @ApiModelProperty(value = "优惠券抵扣金额", example = "1")
    private BigDecimal couponAmount;



    @ApiModelProperty(value = "积分使用状态：0=可用；1=不可用", example = "1")
    private Integer integralStatus;