From adb2f4594760ff2b18e83b8cff5c4ce99dfdff45 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 16:01:05 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 737fc65..78369f0 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -10,6 +10,7 @@
<result column="icon" property="icon"/>
<result column="email" property="email"/>
<result column="nick_name" property="nickName"/>
+ <result column="sex" property="sex"/>
<result column="note" property="note"/>
<result column="create_time" property="createTime"/>
<result column="login_time" property="loginTime"/>
@@ -23,7 +24,7 @@
<result column="mobile" property="mobile"/>
</resultMap>
<resultMap type="com.ycl.entity.user.UmsAdmin" id="CondMapResultMap" extends="BaseResultMap">
- <association property="depart" javaType="com.ycl.entity.depart.UmsDepart">
+ <collection property="depart" javaType="ArrayList" ofType="com.ycl.entity.depart.UmsDepart">
<id column="depart_id" property="id"/>
<result column="depart_name" property="departName"/>
<result column="depart_des" property="departDes"/>
@@ -33,8 +34,9 @@
<result column="depart_create_time" property="createTime"/>
<result column="depart_update_time" property="updateTime"/>
<result column="is_deleted" property="isDeleted"/>
- </association>
- <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id" select="selectAdminRoles">
+ </collection>
+ <collection property="roles" javaType="ArrayList" ofType="com.ycl.entity.user.UmsRole" column="id"
+ select="selectAdminRoles">
<id column="role_id" property="id"/>
<result column="name" property="name"/>
<result column="description" property="description"/>
--
Gitblit v1.8.0