From d4093d81c0d60e830cb8372b40c1d7d042ce9239 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 19:38:04 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtMemberPageVo.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 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 eccf1bf..7908533 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
@@ -19,11 +19,10 @@
public class MgtMemberPageVo {
@ApiModelProperty(value = "会员id")
- @Excel(name = "会员id", width = 30)
private String memberId;
@ApiModelProperty(value = "用户id")
- @Excel(name = "用户id", width = 30)
+ @Excel(name = "用户id", width = 30, sort = 1)
private Long userId;
@ApiModelProperty(value = "会员编号")
@@ -31,77 +30,83 @@
private String memberNo;
@ApiModelProperty(value = "用户姓名")
- @Excel(name = "用户姓名", width = 30)
+ @Excel(name = "用户姓名", width = 30, sort = 3)
private String realName;
@ApiModelProperty(value = "用户昵称")
- @Excel(name = "用户昵称", width = 30)
+ @Excel(name = "用户昵称", width = 30, sort = 2)
private String nickName;
@ApiModelProperty(value = "用户手机")
- @Excel(name = "用户手机", width = 30)
+ @Excel(name = "用户手机", width = 30, sort = 4)
private String mobile;
@ApiModelProperty(value = "用户性别")
- @Excel(name = "用户性别", width = 30)
+ @Excel(name = "用户性别", width = 30, sort = 5)
private String gender;
@ApiModelProperty(value = "用户年龄")
- @Excel(name = "用户年龄", width = 30)
+ @Excel(name = "用户年龄", width = 30, sort = 6)
private Integer age;
@ApiModelProperty(value = "活跃度")
- @Excel(name = "活跃度", width = 30)
+ @Excel(name = "活跃度", width = 30, sort = 7)
private String activeness;
@ApiModelProperty(value = "用户标签 多个,隔开")
- @Excel(name = "用户标签", width = 30)
+ @Excel(name = "用户标签", width = 30, sort = 8)
private String memberTags;
@ApiModelProperty(value = "所属地区")
- @Excel(name = "所属地区", width = 30)
+ @Excel(name = "所属地区", width = 30, sort = 9)
private String belongDistrict;
@ApiModelProperty(value = "是否成为会员")
- @Excel(name = "是否成为会员", width = 30)
+ @Excel(name = "是否成为会员", width = 30, sort = 10)
private String memberFlag;
@ApiModelProperty(value = "注册时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "注册时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "注册时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 11)
private Date createTime;
@ApiModelProperty(value = "最近消费时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "最近消费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "最近消费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 12)
private Date lastPayTime;
@ApiModelProperty(value = "客户类型")
- @Excel(name = "客户类型", width = 30)
+ @Excel(name = "客户类型", width = 30, sort = 13)
private String goodsType;
+ @ApiModelProperty(value = "关联商户id")
+ @Excel(name = "关联商户名称", width = 30, sort = 14)
+ private Long relationShopId;
+
+ private Integer bindingFlag;
+
@ApiModelProperty(value = "关联商户名称")
- @Excel(name = "关联商户名称", width = 30)
+ @Excel(name = "关联商户名称", width = 30, sort = 14)
private String relationShopName;
@ApiModelProperty(value = "积分")
- @Excel(name = "积分", width = 30)
+ @Excel(name = "积分", width = 30, sort = 15)
private Integer integral;
@ApiModelProperty(value = "推荐人")
- @Excel(name = "推荐人", width = 30)
+ @Excel(name = "推荐人", width = 30, sort = 16)
private String referrer;
@ApiModelProperty(value = "会员来源")
- @Excel(name = "会员来源", width = 30)
+ @Excel(name = "会员来源", width = 30, sort = 17)
private String memberFrom;
@ApiModelProperty(value = "消费总金额")
- @Excel(name = "消费总金额", width = 30)
+ @Excel(name = "消费总金额", width = 30, sort = 18)
private BigDecimal totalPayMoney;
@ApiModelProperty(value = "活动参与次数")
- @Excel(name = "活动参与次数", width = 30)
+ @Excel(name = "活动参与次数", width = 30, sort = 19)
private Integer activityTotal;
@ApiModelProperty(value = "头像")
--
Gitblit v1.7.1