Merge remote-tracking branch 'origin/master'

rk

昨天 bd491c37218b0b3d9b518e4814967d814e781c02

 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")