Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

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

@@ -119,5 +119,8 @@
    @ApiModelProperty(value = "分类：一级分类0，二级分类1")
    @TableField(exist = false)
    private Integer typeLevel;
    @ApiModelProperty(value = "商品集合")
    @TableField(exist = false)
    private List<Integer> applyIdList;

}