From 53675c635822794dbd79f0d0197c955af29c688f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 21 Jul 2021 10:46:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management

---
 src/main/java/org/springblade/modules/system/entity/User.java |    5 ++++-
 1 files changed, 4 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 c10345c..e5c7556 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -150,7 +150,10 @@
 	private String hold;
 	private String jurisdiction;
 	private String securitynumber;
-	private String examination;
+	@TableField("examination_type")
+	private String examinationType;
+	@TableField("examination_mx")
+	private String examinationMx;
 	private String fingerprint;
 	private String photo;
 

--
Gitblit v1.9.3