From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 b3ef126..b60c9bf 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
@@ -30,20 +30,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,6 +69,9 @@
*/
@TableField("relation_shop_id")
private Long relationShopId;
+
+ @TableField("relation_shop_name")
+ private String relationShopName;
/**
* 真实姓名
*/
@@ -138,6 +141,24 @@
@TableField("binding_flag")
private Integer bindingFlag;
+ /**
+ * 商品类型
+ */
+ @TableField("goods_type")
+ private String goodsType;
+
+ /**
+ * 调理问题
+ */
+ @TableField("member_nurse")
+ private String memberNurse;
+
+ /**
+ * 所属区域
+ */
+ @TableField("belong_district")
+ private String belongDistrict;
+
@Override
protected Serializable pkVal() {
--
Gitblit v1.7.1