From fa988801544d81ec5f3de97fc5327cd3becd3d01 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 19 Nov 2020 09:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9/resi/group/member/getapplyin?=
 =?UTF-8?q?gmember=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82enterGroupType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/member/result/ApplyingMemberResultDTO.java    | 6 ++++++
 .../src/main/resources/mapper/member/ResiGroupMemberDao.xml | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
index 881333be54..23b94b4c45 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java
@@ -45,4 +45,10 @@ public class ApplyingMemberResultDTO implements Serializable {
 	 * 入群被拒 - rejected 、
 	 */
 	private String status;
+
+	/**
+	 *  invited：通过链接加入 ； join：申请加入；scancode通过扫码加入
+	 */
+	private String enterGroupType;
+
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 7910965741..c0658e21d0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -31,7 +31,8 @@
 		NULL AS applyUserHeadPhoto,
 		NULL AS applyUserName,
 		gmo.OPERATE_DES AS applyReason,
-		gmo.OPERATE_STATUS as status
+		gmo.OPERATE_STATUS as status,
+		gmo.ENTER_GROUP_TYPE as enterGroupType
 	FROM
 		group_memeber_operation gmo
 	WHERE