From db7f0be6a4f8d3e76ddd726fd2f3648d0e0a2e6e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 28 七月 2025 20:06:43 +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/dto/MerMemberPageDto.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 ac9803c..911ae89 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,10 +26,10 @@
private String endMemberDate;
@ApiModelProperty(value = "会员类型1.周期2.服务3.体验")
- private Integer memberType;
+ private String memberType;
- @ApiModelProperty(value = "会员来源1.小程序2.推荐3.店铺创建")
- private Integer memberFrom;
+ @ApiModelProperty(value = "会员来源")
+ private String memberFrom;
@ApiModelProperty(value = "跟进开始时间")
private String taskStartDate;
@@ -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,22 @@
@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;
+
+ @ApiModelProperty(value = "是否今日到店（0=否，1=是）")
+ private Integer isTodayStore;
+
+ @ApiModelProperty(value = "是否有未跟进任务（0=否，1=是）")
+ private Integer isTask;
+
+ private List<Integer> userIds;
+
}
--
Gitblit v1.7.1