From 0b9e60f0bada4cc39187a9dd3c36bf37452f63de Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 31 七月 2025 18:58:10 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 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..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,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; +import java.util.List; /** * @author jqs34 @@ -26,7 +26,7 @@ private String endMemberDate; @ApiModelProperty(value = "会员类型1.周期2.服务3.体验") - private Integer memberType; + private String memberType; @ApiModelProperty(value = "会员来源") private String memberFrom; @@ -40,8 +40,14 @@ @ApiModelProperty(value = "用户标签") private String memberTag; - @ApiModelProperty(value = "剩余次数") + @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; @@ -51,8 +57,28 @@ @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 = "会员活跃度1.活跃2.中度活跃3.轻度活跃") - private Integer memberActivity; + @ApiModelProperty(value = "剩余周期人数(0=否,1=是)") + private Integer residuePeriod; + @ApiModelProperty(value = "剩余体验人数(0=否,1=是)") + private Integer residueExperience; + + private List<Integer> userIds; + } -- Gitblit v1.7.1