Merge remote-tracking branch 'origin/master'

rk

19 小时以前 b53ce008646cc62e0a0f10f4743fb6a73a6ee8bb

 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;