Merge remote-tracking branch 'origin/master'

doum

昨天 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

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

@@ -90,7 +90,7 @@
    @ApiModelProperty(value = "核销码", example = "1")
    private String exchangeCode;

    @ApiModelProperty(value = "抵扣金额", example = "1")
    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integral;

    @ApiModelProperty(value = "快递名称", example = "1")