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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java

@@ -41,4 +41,12 @@ public interface GroupStateConstant {
 	 * 群已关闭 - closed
 	 */
 	String GROUP_CLOSED = "closed";
+	/**
+	 * 邀请链接：link
+	 */
+	String GROUP_LINK = "link";
+	/**
+	 * 扫码：scancode
+	 */
+	String GROUP_SCANCODE = "scancode";
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -181,6 +181,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + NumConstant.FOURTEEN);
 		groupInvitationEntity.setValidEndTime(calendar.getTime());
 		groupInvitationEntity.setResiGroupId(formDTO.getGroupId());
+		groupInvitationEntity.setInvitationType(GroupStateConstant.GROUP_LINK);
 		insert(groupInvitationEntity);
 		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
 		resultDTO.setInvitationId(groupInvitationEntity.getId());