From 6915414d07fdec8b92a0fc5cf30b48d501a4ddac Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Jul 2021 17:29:45 +0800
Subject: [PATCH] 代码合并

---
 src/main/java/org/springblade/modules/system/entity/User.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 91ce77f..a66c990 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,7 +16,9 @@
  */
 package org.springblade.modules.system.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
@@ -91,7 +93,10 @@
 	 * 岗位id
 	 */
 	private String postId;
- * 身份证号
+
+
+	/**
+	 * 身份证
 	 */
 	private String cardid;
 	/**
@@ -145,6 +150,7 @@
 	 */
 	@ApiModelProperty(value = "入职时间")
 	private String rtime;
+	private String hold;
 
 
 

--
Gitblit v1.9.3