From d933448be36d77173a9039fe0c8d210d4e76798c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 15:51:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/entity/User.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 a66c990..b8a6c9d 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -150,8 +150,19 @@
 	 */
 	@ApiModelProperty(value = "入职时间")
 	private String rtime;
+
+
 	private String hold;
 
+	/**
+	 * 行政区域id
+	 */
+	private String jurisdiction;
+	/**
+	 * 保安员证编码
+	 */
+	private String securitynumber;
+
 
 
 }

--
Gitblit v1.9.3