From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..4a24054 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
@@ -28,8 +26,8 @@
@ApiModelProperty(value = "会员类型1.周期2.服务3.体验")
private Integer memberType;
- @ApiModelProperty(value = "会员来源1.小程序2.推荐3.店铺创建")
- private Integer memberFrom;
+ @ApiModelProperty(value = "会员来源")
+ private String memberFrom;
@ApiModelProperty(value = "跟进开始时间")
private String taskStartDate;
@@ -40,8 +38,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;
@@ -52,7 +56,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