Merge remote-tracking branch 'origin/master'

doum

17 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 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;