From 75b7365399fd87efb8691c909aedb5503b03ccc8 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 24 二月 2021 11:04:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
index 3f797d6..88fde0a 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/SystemUser.java
@@ -97,6 +97,12 @@
     private String mobile;
 
     /**
+     * 身份證號
+     */
+    @TableField("certificateNumb")
+    private String certificateNumb;
+
+    /**
      * 状态 0锁定 1有效
      */
     @TableField("STATUS")
@@ -129,7 +135,6 @@
      * 性别 0男 1女 2 保密
      */
     @TableField("SSEX")
-    @NotBlank(message = "{required}")
     @ExcelField(value = "性别", writeConverterExp = "0=男,1=女,2=保密")
     private String sex;
 
@@ -140,6 +145,12 @@
     private String avatar;
 
     /**
+     * 头像
+     */
+    @TableField("nickName")
+    private String nickName;
+
+    /**
      * 描述
      */
     @TableField("DESCRIPTION")

--
Gitblit v1.8.0