From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 ffe3250..310c3d3 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>
@@ -69,6 +67,9 @@
*/
@TableField("relation_shop_id")
private Long relationShopId;
+
+ @TableField("relation_shop_name")
+ private String relationShopName;
/**
* 真实姓名
*/
@@ -138,9 +139,34 @@
@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;
+
+
@Override
protected Serializable pkVal() {
return this.userId;
--
Gitblit v1.7.1