Merge remote-tracking branch 'origin/master'

rk

8 小时以前 4d2dda710968035fa52e69dea47525985674422b

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

@@ -37,7 +37,6 @@
    private Integer editor;

    @ApiModelProperty(value = "更新时间")

    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -73,8 +72,6 @@
    @ApiModelProperty(value = "邀请完成首单奖励优惠券名称 多个以,分割")
    @ExcelColumn(name="奖励邀请人优惠券" ,index =6,width = 10 )
    private String couponNames;



    @ApiModelProperty(value = "被邀请人头像")
    @TableField(exist = false)