From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 01 八月 2025 12:46:00 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 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 0a80147..646edc4 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,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author jqs34
  * @ClassName MerMemberPageDto
@@ -17,4 +19,66 @@
     @ApiModelProperty(value = "关键词")
     private String keyword;
 
+    @ApiModelProperty(value = "成为会员开始时间")
+    private String startMemberDate;
+
+    @ApiModelProperty(value = "成为会员结束时间")
+    private String endMemberDate;
+
+    @ApiModelProperty(value = "会员类型1.周期2.服务3.体验")
+    private String memberType;
+
+    @ApiModelProperty(value = "会员来源")
+    private String memberFrom;
+
+    @ApiModelProperty(value = "跟进开始时间")
+    private String taskStartDate;
+
+    @ApiModelProperty(value = "跟进结束时间")
+    private String taskEndDate;
+
+    @ApiModelProperty(value = "用户标签")
+    private String memberTag;
+
+    @ApiModelProperty(value = "剩余次数1.5次以下2.5-10次3.10次以上")
+    private Integer surpNum;
+
+    @ApiModelProperty(value = "剩余次数")
+    private Integer surpStartNum;
+
+    @ApiModelProperty(value = "剩余次数")
+    private Integer surpEndNum;
+
+    @ApiModelProperty(value = "会员等级")
+    private String memberLevel;
+
+    @ApiModelProperty(value = "会员调理问题")
+    private String memberNurse;
+
+    @ApiModelProperty(value = "会员性别0男1女")
+    private Integer memberGender;
+    
+    @ApiModelProperty(value = "会员活跃度")
+    private String memberActiveness;
+    
+    @ApiModelProperty(value = "活跃度开始时间", hidden = true)
+    private String actStartDate;
+    
+    @ApiModelProperty(value = "活跃度结束时间", hidden = true)
+    private String actEndDate;
+    
+    @ApiModelProperty(value = "是否今日到店(0=否,1=是)")
+    private Integer isTodayStore;
+    
+    @ApiModelProperty(value = "是否有未跟进任务(0=否,1=是)")
+    private Integer isTask;
+
+    @ApiModelProperty(value = "剩余周期人数(0=否,1=是)")
+    private Integer residuePeriod;
+
+    @ApiModelProperty(value = "剩余体验人数(0=否,1=是)")
+    private Integer residueExperience;
+    
+    private List<Integer> userIds;
+    
 }

--
Gitblit v1.7.1