From e1f5ba620ad2f0b3f62c1faa45ad65a854a3c79a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 六月 2024 20:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 9 ++++++++-
1 files changed, 8 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..14da973 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
@@ -14,7 +14,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* <p>
* 会员表
@@ -43,24 +43,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,6 +102,7 @@
private Integer delFlag;
@ApiModelProperty(value = "1未认证，2已认证")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isAuthentication;
@ApiModelProperty(value = "后台对应id")
--
Gitblit v1.7.1