Merge remote-tracking branch 'origin/master'

doum

4 天以前 2c1415e6c7bf6837cb24768770b10821853a6341

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

@@ -127,7 +127,6 @@
    private String parentCategoryId;

    @ApiModelProperty(value = "抵扣比例（0.1%~100%）", example = "1", hidden = true)
    @TableField(exist = false)
    private BigDecimal deductRata;