From 0bf618ca34814ee535c5d39387dc63532b4e726a Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期四, 04 五月 2023 16:16:39 +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 | 16 +++++++++++++--- 1 files changed, 13 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..8a9e83d 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,16 @@ @TableField("update_user_id") private Long updateUserId; + /** + * 用户标签 + */ + @TableField("user_tags") + private String userTags; + + /** + * 用户头像 + */ + private String avatar; @Override protected Serializable pkVal() { -- Gitblit v1.7.1