From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs
---
src/main/resources/mapper/UserMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 40c2a71..df40f6c 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -6,10 +6,14 @@
<resultMap id="BaseResultMap" type="com.zy.system.entity.User">
<id column="id" property="id" />
<result column="host_id" property="hostId" />
+ <result column="role_id" property="roleId" />
+ <result column="dept_id" property="deptId" />
<result column="username" property="username" />
<result column="mobile" property="mobile" />
<result column="password" property="password" />
- <result column="role_id" property="roleId" />
+ <result column="avatar" property="avatar" />
+ <result column="email" property="email" />
+ <result column="sex" property="sex" />
<result column="create_time" property="createTime" />
<result column="status" property="status" />
--
Gitblit v1.9.1