From 210cec98d85db252eef7e8d8a0b91a69bb05e165 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 9 Aug 2020 22:05:50 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=8F=96=E6=B6=88User=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/system/user/entity/User.java | 2 -- .../main/java/org/springblade/system/user/vo/UserVO.java | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java index 5aef1d0a..87b6e9ca 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java @@ -17,7 +17,6 @@ package org.springblade.system.user.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @@ -47,7 +46,6 @@ public class User extends TenantEntity { /** * 密码 */ - @JsonIgnore private String password; /** * 昵称 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java index eb59a77b..1dc5c754 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/vo/UserVO.java @@ -16,6 +16,7 @@ */ package org.springblade.system.user.vo; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; @@ -40,6 +41,12 @@ public class UserVO extends User { @JsonSerialize(using = ToStringSerializer.class) private Long id; + /** + * 密码 + */ + @JsonIgnore + private String password; + /** * 租户名 */