Merge remote-tracking branch 'origin/master'

doum

昨天 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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

@@ -72,6 +72,7 @@
    @ApiModelProperty(value = "单位")
    @ExcelColumn(name="单位")
    private String unitName;

    @ApiModelProperty(value = "积分最多抵扣比例")
    @ExcelColumn(name="积分最多抵扣比例")
    private BigDecimal integralRate;