Merge remote-tracking branch 'origin/master'

rk

22 小时以前 bd491c37218b0b3d9b518e4814967d814e781c02

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

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



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


    @ApiModelProperty(value = "商品标签名称")