From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
index 6b6a29e..df982b5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
@@ -6,15 +6,16 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.GenderEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
/**
* <p>
* 会员表
@@ -43,24 +44,30 @@
private String avatar;
@ApiModelProperty(value = "会员姓名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String realName;
@ApiModelProperty(value = "身份证号")
private String idNumber;
@ApiModelProperty(value = "联系电话")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String phone;
@ApiModelProperty(value = "性别 0=女,1=男,2=未知")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private GenderEnum gender;
@ApiModelProperty(value = "等级")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer level;
@ApiModelProperty(value = "会员积分")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer totalPoints;
@ApiModelProperty(value = "已用积分")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer usedPoints;
@ApiModelProperty(value = "微信openid")
@@ -74,6 +81,9 @@
@ApiModelProperty(value = "支付宝openid")
private String zfbOpenid;
+
+ @ApiModelProperty(value = "会员分类(1:普通用户；2：会员用户；3：超级会员用户)")
+ private Integer vipClassify;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
@@ -96,9 +106,15 @@
private Integer delFlag;
@ApiModelProperty(value = "1未认证，2已认证")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuthentication;
@ApiModelProperty(value = "后台对应id")
private Long userId;
+ @ApiModelProperty(value = "用户消费金额")
+ private BigDecimal money;
+
+ @ApiModelProperty(value = "会员分类(1：普通用户；2：会员用户；3：超级会员用户；)")
+ private Integer vipClassify;
}
--
Gitblit v1.7.1