Merge remote-tracking branch 'origin/master'

doum

昨天 a76e2318dd2731ff713df6e262396a9175d029f7

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

@@ -105,6 +105,9 @@
    private String imgFullurl;


    @ApiModelProperty(value = "图标")
    @TableField(exist = false)
    private String imgurlfull;
    @ApiModelProperty(value = "父类名称")
    @TableField(exist = false)
    private String parentName;