From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +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/pojo/member/MemberTotal.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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 bdee645..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
@@ -1,16 +1,16 @@
package com.ruoyi.member.domain.pojo.member;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -82,7 +82,7 @@
* 下次跟进时间
*/
@TableField("next_task_time")
- private Date nextTaskTime;
+ private String nextTaskTime;
/**
* 总服务次数
*/
@@ -116,8 +116,8 @@
/**
* 总体验订单数
*/
- @TableField("tolta_experience_order")
- private Integer toltaExperienceOrder;
+ @TableField("total_experience_order")
+ private Integer totalExperienceOrder;
/**
* 总服务订单数
*/
@@ -129,6 +129,43 @@
@TableField("total_goods_order")
private Integer totalGoodsOrder;
+ /**
+ * 分享标记
+ */
+ @TableField("share_flag")
+ private Integer shareFlag;
+ /**
+ * 平台建议标记
+ */
+ @TableField("pl_suggest_flag")
+ private Integer plSuggestFlag;
+ /**
+ * 门店建议标记
+ */
+ @TableField("shop_suggest_flag")
+ private Integer shopSuggestFlag;
+ /**
+ * 签到标记
+ */
+ @TableField("sign_flag")
+ private Integer signFlag;
+ /**
+ * 消费标记
+ */
+ @TableField("buy_flag")
+ private Integer buyFlag;
+
+ /**
+ * 最后消费时间
+ */
+ @TableField("last_consume_time")
+ private Date lastConsumeTime;
+
+ /**
+ * 总消费次数
+ */
+ @TableField("total_consume_count")
+ private Integer totalConsumeCount;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1