Merge remote-tracking branch 'origin/master'

doum

12 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

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

@@ -85,6 +85,11 @@
    @ApiModelProperty(value = "真实库存")
    private Integer stock;

    @ApiModelProperty(value = "收藏状态：0=未收藏；1=已收藏")
    private Integer collectStatus;



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