From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 09:32:38 +0800
Subject: [PATCH] 修改数据权限bug

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 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..51b3ab5 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
@@ -17,4 +17,52 @@
     @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;
+
 }

--
Gitblit v1.7.1