From fe56b4374be4b40fab45cf08e38e3ccd491fdc98 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 12:08:54 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
index 3b6b49f..83dd638 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java
@@ -1,17 +1,15 @@
package com.ruoyi.system.api.domain.poji.member;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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.util.Date;
/**
* <p>
@@ -30,21 +28,20 @@
private static final long serialVersionUID = 1L;
/**
+ * 会员id
+ */
+ @TableId("member_id")
+ private String memberId;
+ /**
* 用户id
*/
- @TableId("user_id")
+ @TableField("user_id")
private Long userId;
-
/**
* 删除标记
*/
@TableField("del_flag")
private Integer delFlag;
- /**
- * 会员id
- */
- @TableField("member_id")
- private String memberId;
/**
* 会员编号
*/
@@ -70,6 +67,9 @@
*/
@TableField("relation_shop_id")
private Long relationShopId;
+
+ @TableField("relation_shop_name")
+ private String relationShopName;
/**
* 真实姓名
*/
@@ -139,10 +139,47 @@
@TableField("binding_flag")
private Integer bindingFlag;
+ /**
+ * 绑定时间
+ */
+ @TableField("binding_time")
+ private Date bindingTime;
+ /**
+ * 商品类型
+ */
+ @TableField("goods_type")
+ private String goodsType;
+
+ /**
+ * 调理问题
+ */
+ @TableField("member_nurse")
+ private String memberNurse;
+
+ /**
+ * 所属区域
+ */
+ @TableField("belong_district")
+ private String belongDistrict;
+
+ @TableField("frozen_flag")
+ private Integer frozenFlag;
+
+ /**
+ * 绑定类型1商城订单2活动订单3线下订单4核销优惠券5核销奖品6商户创建7平台变动8商户绑定
+ */
+ @TableField("binding_type")
+ private Integer bindingType;
+ /**
+ * 上次确认服务的id
+ */
+ @TableField("last_service_id")
+ private String lastServiceId;
+
@Override
protected Serializable pkVal() {
return this.userId;
}
-
+
}
--
Gitblit v1.7.1