Merge remote-tracking branch 'origin/master'

doum

4 天以前 2c1415e6c7bf6837cb24768770b10821853a6341

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

@@ -192,6 +192,9 @@
    @ApiModelProperty(value = "商品sku信息")
    @TableField(exist = false)
    private List<Sku>  skuList;
    @ApiModelProperty(value = "商品编码集合")
    @TableField(exist = false)
    private List<Integer>  idList;
    @ApiModelProperty(value = "商品sku信息")
    @TableField(exist = false)
    private List<Labels>  brandList;