From add86a49cc69b6882500c95dd67a2ac826c35526 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 20:16:51 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java
index d2c9559..f5abee2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java
@@ -4,8 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author jqs34
  * @ClassName MerMemberPageDto
@@ -52,7 +50,13 @@
     @ApiModelProperty(value = "会员性别0男1女")
     private Integer memberGender;
 
-    @ApiModelProperty(value = "会员活跃度1.活跃2.中度活跃3.轻度活跃")
-    private Integer memberActivity;
+    @ApiModelProperty(value = "会员活跃度")
+    private String memberActiveness;
+
+    @ApiModelProperty(value = "活跃度开始时间",hidden = true)
+    private String actStartDate;
+
+    @ApiModelProperty(value = "活跃度结束时间",hidden = true)
+    private String actEndDate;
 
 }

--
Gitblit v1.7.1