From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/entity/User.java |   16 ++++++++++++++++
 1 files changed, 16 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 e2f6261..892bde0 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -150,6 +150,22 @@
 	private String hold;
 	private String jurisdiction;
 	private String securitynumber;
+	@TableField("examination_type")
+	private String examinationType;
+	@TableField("examination_mx")
+	private String examinationMx;
+	private String fingerprint;
+	private String photo;
+	/**
+	 * 是否派遣
+	 */
+	private String dispatch;
+
+	/**
+	 * 个人照片,电子照,用于展示保安证,准考证用
+	 */
+	@TableField("my_picture")
+	private String myPicture;
 
 
 }

--
Gitblit v1.9.3