Merge remote-tracking branch 'origin/master'

doum

6 小时以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

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

@@ -64,6 +64,14 @@
    @ApiModelProperty(value = "邀请奖励积分")
    private BigDecimal rewardIntegral;

    @ApiModelProperty(value = "邀请完成首单奖励优惠券主键 多个以,分割")
    private String couponIds;

    @ApiModelProperty(value = "邀请完成首单奖励优惠券名称 多个以,分割")
    private String couponNames;



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