Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java

@@ -98,6 +98,8 @@
    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integralDeduct;

    @ApiModelProperty(value = "经销商结算金额", example = "1")
    private BigDecimal shopSettlement;