From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
index 828c1c9..709a714 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java
@@ -1,9 +1,9 @@
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;
import java.util.List;
@@ -20,30 +20,36 @@
@ApiModelProperty(value = "用户id")
private Long userId;
- @ApiModelProperty(name = "用户名称")
- private String nickName;
+ @ApiModelProperty(value = "用户名称")
+ private String realName;
- @ApiModelProperty(name = "手机号码")
+ @ApiModelProperty(value = "手机号码")
private String phonenumber;
- @ApiModelProperty(name = "性别0=男,1=女,2=未知")
+ @ApiModelProperty(value = "性别0=男,1=女,2=未知")
private Integer gender;
- @ApiModelProperty(name = "推荐人")
+ @ApiModelProperty(value = "推荐人")
private String referrer;
- @ApiModelProperty(name = "顾客来源")
+ @ApiModelProperty(value = "顾客来源")
private String customerSource;
- @ApiModelProperty(name = "等级")
+ @ApiModelProperty(value = "等级")
private String level;
- @ApiModelProperty(name = "生日")
+ @ApiModelProperty(value = "生日")
private String birthday;
- @ApiModelProperty(name = "调理问题")
+ @ApiModelProperty(value = "调理问题")
private List<String> memberNurse;
- @ApiModelProperty(name = "创建时间")
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+
+ @ApiModelProperty(value = "用户档案")
+ private List<MemberArchiveVo> achiveList;
+
+
}
--
Gitblit v1.7.1