Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_imGroup

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

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

@@ -5,6 +5,19 @@ import com.ym.mec.biz.dal.entity.ImGroupMember;
 
 public class ImGroupMemberDto extends ImGroupMember {
 	private SysUser user = new SysUser();
+    private String type;
+    private String imUserId;
+    @ApiModelProperty(value = "群编号;")
+    private String groupId;
+    @ApiModelProperty("群成员头象")
+    private String avatar;
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 
     public SysUser getUser() {
 		return user;
@@ -13,4 +26,28 @@ public class ImGroupMemberDto extends ImGroupMember {
 	public void setUser(SysUser user) {
 		this.user = user;
 	}
+
+    public String getImUserId() {
+        return String.valueOf(getUserId());
+    }
+
+    public void setImUserId(String imUserId) {
+        this.imUserId = imUserId;
+    }
+
+    public String getGroupId() {
+        return getImGroupId();
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
 }