Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -127,6 +127,9 @@
    @ApiModelProperty(value = "实际适用时金额")
    @TableField(exist = false)
    private BigDecimal validAmount;
    @ApiModelProperty(value = "用户手机号")
    @TableField(exist = false)
    private String memberPhone;

    @ApiModelProperty(value = "优惠金额（元）", example = "1")
    @ExcelColumn(name="优惠金额（元）",width = 10,index = 7)