From 642414e16907bdd2a47642a9a83c1bc002c6b081 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 12 Aug 2021 20:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 34658f9..76d3e17 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -42,7 +42,8 @@
<result column="dispatch" property="dispatch"/>
<result column="my_picture" property="myPicture"/>
<result column="is_apply" property="isApply"/>
- <result column="deptname" property="deptname"/>
+ <result column="is_apply" property="isApply"/>
+ <result column="is_train" property="isTrain"/>
<result column="birthtime" property="birthtime"/>
</resultMap>
--
Gitblit v1.9.3