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

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -168,7 +168,8 @@ public enum EpmetErrorCode {
 	GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片"),
 	PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员，不能创建支部小组"),
 	NOT_IN_GROUP_CAN_NOT_VIEW(8907,"当前内容仅允许组内成员查看"),
-	CAN_NOT_CANCEL(8908,"活动%s,不能取消");
+	PARTY_MEMBER_JOIN_BRANCH_GROUP(8908,"您不是党员，不能加入支部小组"),
+	CAN_NOT_CANCEL(8909,"活动%s,不能取消");
 
 
 	private int code;