From 0398509aa5f27bd6f987adf3d24eceef56b07b4c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 19:04:55 +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 |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 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 6f1ecc5..2c6dd74 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
@@ -67,8 +67,8 @@
     /**
      * 关联商户id
      */
-    @TableField("realtion_shop_id")
-    private Long realtionShopId;
+    @TableField("relation_shop_id")
+    private Long relationShopId;
     /**
      * 真实姓名
      */
@@ -79,7 +79,7 @@
      */
     private String mobile;
     /**
-     * 性别0未知1男2女
+     * 性别0=男,1=女,2=未知
      */
     private Integer gender;
     /**
@@ -115,6 +115,23 @@
     @TableField("update_user_id")
     private Long updateUserId;
 
+    /**
+     * 用户标签
+     */
+    @TableField("user_tags")
+    private String userTags;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 绑定标记0否1是
+     */
+    @TableField("binding_flag")
+    private Integer bindingFlag;
+
 
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1