From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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..e43dc66 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
@@ -3,28 +3,52 @@
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 = "用户昵称")
+ @ApiModelProperty(name = "用户名称")
private String nickName;
- @ApiModelProperty(value = "性别")
- private String gender;
+ @ApiModelProperty(name = "手机号码")
+ private String phonenumber;
- @ApiModelProperty(value = "用户电话")
- private String mobile;
+ @ApiModelProperty("用户头像")
+ private String avatar;
+ @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 = "最近跟进任务时间")
+ private Date lastTaskTime;
+
+ @ApiModelProperty(value = "下次跟进任务时间")
+ private Date nextTaskTime;
}
--
Gitblit v1.7.1