From d9810cb296a7144569fca0172168d54d712f9b7a Mon Sep 17 00:00:00 2001
From: xuyuxiang <YJLP2014>
Date: Tue, 23 Feb 2021 17:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=88=B7=E7=94=9F=E6=97=A5=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/views/system/user/editForm.vue                      | 2 +-
 .../java/com/cn/xiaonuo/sys/modular/user/entity/SysUser.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/_web/src/views/system/user/editForm.vue b/_web/src/views/system/user/editForm.vue
index a204c5db..c1fb871b 100644
--- a/_web/src/views/system/user/editForm.vue
+++ b/_web/src/views/system/user/editForm.vue
@@ -459,7 +459,7 @@
             values.sysEmpParam['extIds'] = this.sysEmpParamExtList
             // eslint-disable-next-line eqeqeq
             if (this.birthdayString == 'Invalid date') {
-              this.birthdayString = ''
+              this.birthdayString = null
             }
             values.birthday = this.birthdayString
             sysUserEdit(values).then((res) => {
diff --git a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/user/entity/SysUser.java b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/user/entity/SysUser.java
index 5c41b9ac..f8cfaae9 100644
--- a/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/user/entity/SysUser.java
+++ b/xiaonuo-base/xiaonuo-system/src/main/java/com/cn/xiaonuo/sys/modular/user/entity/SysUser.java
@@ -25,9 +25,7 @@ XiaoNuo采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注
 package com.cn.xiaonuo.sys.modular.user.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.cn.xiaonuo.core.pojo.base.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -82,6 +80,7 @@ public class SysUser extends BaseEntity {
     /**
      * 生日
      */
+    @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     @Excel(name = "生日", databaseFormat = "yyyy-MM-dd HH:mm:ss", format = "yyyy-MM-dd", width = 20)
     private Date birthday;