Merge remote-tracking branch 'origin/master'

doum

17 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 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;