Merge branch 'feature/1020-tencent-im' into test

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ImGroupMemberDto.java

@@ -12,8 +12,6 @@ public class ImGroupMemberDto extends ImGroupMember {
 
     private String imUserId;
 
-    private String userType;
-
     @ApiModelProperty(value = "群编号;")
     private String groupId;
 
@@ -45,11 +43,4 @@ public class ImGroupMemberDto extends ImGroupMember {
         return getImGroupId();
     }
 
-    public String getUserType() {
-        return userType;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
 }

mec-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -37,6 +37,8 @@
 		<result column="username_" property="user.username" />
 		<result column="avatar_" property="user.avatar" />
 		<result column="phone_" property="user.phone" />
+		<result column="real_name_" property="user.realName" />
+		<result column="user_type_" property="user.userType" />
 		<result column="group_nickname_" property="groupNickname" />
 	</resultMap>