From fe2b2e037a91fbc22bd887174d37c7dd229333d3 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 15:02:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
index 55077a0..eeddfdf 100644
--- a/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
+++ b/xboot-core/src/main/java/cn/exrick/xboot/core/entity/User.java
@@ -95,9 +95,6 @@
@ApiModelProperty(value = "鎵�灞為儴闂ㄥ悕绉�")
private String departmentTitle;
- @ApiModelProperty(value = "鎸囩汗鐧婚檰瀵嗙爜")
- private String key;
-
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "鐢熸棩")
@@ -117,4 +114,5 @@
@TableField(exist = false)
@ApiModelProperty(value = "瀵煎叆鏁版嵁鏃朵娇鐢�")
private Integer defaultRole;
+
}
--
Gitblit v1.9.1