From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 09:32:38 +0800
Subject: [PATCH] 修改数据权限bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
index eca8591..6682652 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
@@ -1,30 +1,66 @@
package com.ruoyi.member.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
/**
* @author jqs34
- * @ClassName MerMemberInfoVo
+ * @version 1.0
+ * @classname MerMeberInfoVo
* @description: TODO
- * @date 2023年05月04日
- * @version: 1.0
+ * @date 2023 2023/5/4 22:48
*/
@Data
public class MerMemberInfoVo {
-
@ApiModelProperty(value = "用户id")
private Long userId;
- @ApiModelProperty(value = "用户昵称")
- private String nickName;
+ @ApiModelProperty(value = "用户名称")
+ private String realName;
- @ApiModelProperty(value = "性别")
- private String gender;
+ @ApiModelProperty(value = "手机号码")
+ private String phonenumber;
- @ApiModelProperty(value = "用户电话")
- private String mobile;
+ @ApiModelProperty(value="用户头像")
+ private String avatar;
+ @ApiModelProperty(value="用户生日")
+ private String birthday;
+ @ApiModelProperty(value = "用户类型")
+ private String memberType;
+
+ @ApiModelProperty(value = "用户标签")
+ private String userTags;
+
+ @ApiModelProperty(value = "次数剩余")
+ private Integer surpNumber;
+
+ @ApiModelProperty(value = "消费次数")
+ private Integer userNumber;
+
+ @ApiModelProperty(value = "消费总额")
+ private BigDecimal payMoney;
+
+ @ApiModelProperty(value = "待支付金额")
+ private BigDecimal unpaidMoney;
+
+ @ApiModelProperty(value = "最近跟进任务")
+ private String lastTaskContent;
+
+ @ApiModelProperty(value = "最近跟进任务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastTaskTime;
+
+ @ApiModelProperty(value = "下次跟进任务时间")
+ private String nextTaskTime;
+
+ @ApiModelProperty(value = "最近消费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastPayTime;
}
--
Gitblit v1.7.1