Merge remote-tracking branch 'origin/master'

doum

12 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java

@@ -88,7 +88,11 @@
    @ApiModelProperty(value = "收藏状态：0=未收藏；1=已收藏")
    private Integer collectStatus;

    @ApiModelProperty(value = "适用品牌ID集合，（[1],[2]）")
    private String brandIds ;

    @ApiModelProperty(value = "适用品牌名称")
    private String brandNames ;

//    @ApiModelProperty(value = "商品标签")
//    private List<Labels> labelsList;