Merge remote-tracking branch 'origin/dev_group_code' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java

@@ -51,4 +51,10 @@ public class ApplyingMemberResultDTO implements Serializable {
 	 * 用户徽章Url列表
 	 */
 	private List<String> badgeList;
+
+	/**
+	 *  invited：通过链接加入 ； join：申请加入；scancode通过扫码加入
+	 */
+	private String enterGroupType;
+
 }

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