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/mapper/UserMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 2eece6d..6e5e9ad 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -39,7 +39,8 @@
         <result column="hold" property="hold"/>
         <result column="jurisdiction" property="jurisdiction"/>
         <result column="securitynumber" property="securitynumber"/>
-        <result column="examination" property="examination"/>
+        <result column="examinationType" property="examinationType"/>
+        <result column="examinationMx" property="examinationMx"/>
         <result column="fingerprint" property="fingerprint"/>
         <result column="photo" property="photo"/>
     </resultMap>

--
Gitblit v1.9.3