From b4882b114f082e010d4cc3359d78d18095ef3b83 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:49:38 +0800
Subject: [PATCH] 商户端和管理台联调bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
index 06f6c73..ff21aaa 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java
@@ -1,8 +1,7 @@
package com.ruoyi.member.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,64 +19,88 @@
public class MgtMemberPageVo {
@ApiModelProperty(value = "会员id")
+ @Excel(name = "会员id", width = 30)
private String memberId;
@ApiModelProperty(value = "用户id")
+ @Excel(name = "用户id", width = 30)
private Long userId;
@ApiModelProperty(value = "会员编号")
+ @Excel(name = "会员编号", width = 30)
private String memberNo;
@ApiModelProperty(value = "用户姓名")
+ @Excel(name = "用户姓名", width = 30)
private String realName;
@ApiModelProperty(value = "用户昵称")
+ @Excel(name = "用户昵称", width = 30)
private String nickName;
@ApiModelProperty(value = "用户手机")
+ @Excel(name = "用户手机", width = 30)
private String mobile;
@ApiModelProperty(value = "用户性别")
+ @Excel(name = "用户性别", width = 30)
private String gender;
@ApiModelProperty(value = "用户年龄")
+ @Excel(name = "用户年龄", width = 30)
private Integer age;
@ApiModelProperty(value = "活跃度")
+ @Excel(name = "活跃度", width = 30)
private String activeness;
@ApiModelProperty(value = "用户标签 多个,隔开")
+ @Excel(name = "用户标签", width = 30)
private String memberTags;
@ApiModelProperty(value = "所属地区")
+ @Excel(name = "所属地区", width = 30)
private String belongDistrict;
@ApiModelProperty(value = "是否成为会员")
+ @Excel(name = "是否成为会员", width = 30)
private String memberFlag;
@ApiModelProperty(value = "注册时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "注册时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "最近消费时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "最近消费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date lastPayTime;
@ApiModelProperty(value = "客户类型")
+ @Excel(name = "客户类型", width = 30)
private String goodsType;
- @ApiModelProperty(value = "客户类型")
+ @ApiModelProperty(value = "关联商户名称")
+ @Excel(name = "关联商户名称", width = 30)
private String relationShopName;
@ApiModelProperty(value = "积分")
+ @Excel(name = "积分", width = 30)
private Integer integral;
@ApiModelProperty(value = "推荐人")
+ @Excel(name = "推荐人", width = 30)
private String referrer;
@ApiModelProperty(value = "会员来源")
+ @Excel(name = "会员来源", width = 30)
private String memberFrom;
@ApiModelProperty(value = "消费总金额")
+ @Excel(name = "消费总金额", width = 30)
private BigDecimal totalPayMoney;
+
+ @ApiModelProperty(value = "活动参与次数")
+ @Excel(name = "活动参与次数", width = 30)
+ private Integer activityTotal;
}
--
Gitblit v1.7.1