Merge remote-tracking branch 'origin/master'

rk

14 小时以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

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

@@ -202,6 +202,12 @@
    @ApiModelProperty(value = "商品SKU规格组")
    @TableField(exist = false)
    private List<GoodsSku>  goodsSkuList;
    @ApiModelProperty(value = "供銷商数量")
    @TableField(exist = false)
    private Long shopNum;
    @ApiModelProperty(value = "已设置供銷商数量")
    @TableField(exist = false)
    private Long pricedShopNum;


}