From 328105ebdbb82a923c2a02ed01786c129a4aacb1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 23 十月 2025 17:33:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
index 8027050..c46713d 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
@@ -5,6 +5,7 @@
import cn.lili.common.security.sensitive.enums.SensitiveStrategy;
import cn.lili.common.utils.CommonUtil;
import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -71,7 +72,7 @@
@ApiModelProperty(value = "浼氬憳澶村儚")
private String face;
- @ApiModelProperty(value = "浼氬憳鐘舵��")
+ @ApiModelProperty(value = "浼氬憳鐘舵�侊細true 琛ㄧず娌¤绂佺敤锛� false 琚鐢�")
private Boolean disabled;
@ApiModelProperty(value = "鏄惁寮�閫氬簵閾�")
@@ -79,6 +80,10 @@
@ApiModelProperty(value = "搴楅摵ID")
private String storeId;
+
+ @ApiModelProperty(value = "uuId")
+ @TableField(value = "uu_id")
+ private String uuId;
/**
* @see ClientTypeEnum
@@ -97,6 +102,8 @@
@ApiModelProperty(value = "缁忛獙鍊兼暟閲�")
private Long experience;
+ @TableField("share_store_id")
+ private String shareStoreId;
public Member(String username, String password, String mobile) {
this.username = username;
@@ -111,7 +118,7 @@
this.lastLoginDate = new Date();
}
- public Member(String username, String password, String face, String nickName, Integer sex,String mobile) {
+ public Member(String username, String password, String face, String nickName, Integer sex, String mobile) {
this.username = username;
this.password = password;
this.mobile = mobile;
--
Gitblit v1.8.0