Merge remote-tracking branch 'origin/master'

doum

17 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

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

@@ -36,9 +36,6 @@
    @ApiModelProperty(value = "剩余积分值", example = "1")
    private BigDecimal surplusIntegral;




    @ApiModelProperty(value = "邮费金额", example = "1")
    private BigDecimal mailAmount;