From 72b62513dbb8621658628a07001c5a159c130738 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 24 Jul 2023 09:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/resources/mapper/UserMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/UserMapper.xml b/screen-api/src/main/resources/mapper/UserMapper.xml
index cc4fe83..fa2b662 100644
--- a/screen-api/src/main/resources/mapper/UserMapper.xml
+++ b/screen-api/src/main/resources/mapper/UserMapper.xml
@@ -28,10 +28,10 @@
<result column="org_expire_time" property="expireTime"/>
</association>
<!--���������-->
- <collection property="groups" ofType="com.moral.api.entity.Group" javaType="java.util.ArrayList">
+ <association property="group" javaType="com.moral.api.entity.Group">
<id column="group_id" property="id" jdbcType="INTEGER"/>
<result column="group_name" property="groupName" jdbcType="VARCHAR"/>
- </collection>
+ </association>
</resultMap>
<!--������������������������������������������-->
--
Gitblit v1.8.0