From 916ff14278f99378758272784a00abee12a4f126 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 16:48:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberAddDto.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberAddDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberAddDto.java
index 179f7e5..0b74f69 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberAddDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberAddDto.java
@@ -1,10 +1,10 @@
package com.ruoyi.member.domain.dto;
+import com.ruoyi.member.domain.vo.MemberArchiveVo;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
import java.util.List;
/**
@@ -19,7 +19,7 @@
@ApiModelProperty(value = "用户昵称")
- private String nickName;
+ private String realName;
@ApiModelProperty(value = "手机号码")
private String phonenumber;
@@ -42,4 +42,7 @@
@ApiModelProperty(value = "调理问题")
private List<String> memberNurse;
+ @ApiModelProperty(value = "用户档案")
+ private List<MemberArchiveVo> achiveList;
+
}
--
Gitblit v1.7.1