From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java
index 7f9787b..5b30149 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java
@@ -82,7 +82,7 @@
* 下次跟进时间
*/
@TableField("next_task_time")
- private Date nextTaskTime;
+ private String nextTaskTime;
/**
* 总服务次数
*/
@@ -155,6 +155,18 @@
@TableField("buy_flag")
private Integer buyFlag;
+ /**
+ * 最后消费时间
+ */
+ @TableField("last_consume_time")
+ private Date lastConsumeTime;
+
+ /**
+ * 总消费次数
+ */
+ @TableField("total_consume_count")
+ private Integer totalConsumeCount;
+
@Override
protected Serializable pkVal() {
return this.memberId;
--
Gitblit v1.7.1