Merge remote-tracking branch 'origin/master'

doum

15 小时以前 04aa86aaad90ac02a4d167129ab3e530e9a9589c

 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;