Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/PayDetailRequest.java

@@ -27,5 +27,7 @@
    @ApiModelProperty(value = "购物车商品主键")
    private Integer shopCartId;

    @ApiModelProperty(value = "优惠券抵扣金额",hidden = true)
    private BigDecimal deductAmount;

}