From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 e2b2384..7617608 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
@@ -10,11 +10,12 @@
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;
-
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* <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")
@@ -96,9 +103,14 @@
private Integer delFlag;
@ApiModelProperty(value = "1未认证，2已认证")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuthentication;
- @ApiModelProperty(value = "后天对应id")
+ @ApiModelProperty(value = "后台对应id")
private Long userId;
+ @ApiModelProperty(value = "用户消费金额")
+ private BigDecimal money;
+
+
}
--
Gitblit v1.7.1