Merge remote-tracking branch 'origin/master'

rk

17 小时以前 086be7eae50e48ad554fd8a3f4cb1e333d587595

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

@@ -117,6 +117,9 @@
    @TableField(exist = false)
    @ExcelColumn(name="用户",width = 10,index = 1)
    private String nikeName;
    @ApiModelProperty(value = "统计数量")
    @TableField(exist = false)
    private Long num;
    @ApiModelProperty(value = "关联订单号号")
    @ExcelColumn(name="关联订单号",width = 10,index = 10)
    @TableField(exist = false)