From 3dddd301e97c263dda6326c89fa11176d5960b04 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 12:11:36 +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/vo/MerMemberPageVo.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberPageVo.java
index 236ed14..6fa4fbb 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberPageVo.java
@@ -3,6 +3,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author jqs34
  * @ClassName MerMemberPageVo
@@ -42,6 +44,16 @@
 
     @ApiModelProperty(value = "用户标签")
     private String userTags;
-
-
+    
+    @ApiModelProperty(value = "商品类型")
+    private String goodsType;
+    
+    @ApiModelProperty(value = "最近消费时间", hidden = true)
+    private Date lastPayTime;
+    
+    @ApiModelProperty(value = "活跃度")
+    private String memberActiveness;
+    
+    @ApiModelProperty(value = "调理问题")
+    private String memberNurse;
 }

--
Gitblit v1.7.1