Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

 server/services/src/main/java/com/doumee/dao/business/model/Category.java

@@ -98,4 +98,8 @@
    @ApiModelProperty(value = "图标全路径")
    @TableField(exist = false)
    private String iconFull;

    @ApiModelProperty(value = "自关联对象名称")
    @TableField(exist = false)
    private String relationName;
}