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-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 2c6dd74..5416f94 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,20 +28,20 @@
private static final long serialVersionUID = 1L;
/**
+ * 会员id
+ */
+ @TableId("member_id")
+ private String memberId;
+ /**
* 用户id
*/
- @TableId(value = "user_id",type = IdType.AUTO)
+ @TableField("user_id")
private Long userId;
/**
* 删除标记
*/
@TableField("del_flag")
private Integer delFlag;
- /**
- * 会员id
- */
- @TableField("member_id")
- private String memberId;
/**
* 会员编号
*/
@@ -69,11 +67,20 @@
*/
@TableField("relation_shop_id")
private Long relationShopId;
+
+ @TableField("relation_shop_name")
+ private String relationShopName;
/**
* 真实姓名
*/
@TableField("real_name")
private String realName;
+
+ /**
+ * 昵称
+ */
+ @TableField("nick_name")
+ private String nickName;
/**
* 手机号
*/
@@ -132,6 +139,38 @@
@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平台变动
+ */
+ @TableField("binding_type")
+ private Integer bindingType;
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1