Merge branch 'master' into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -259,6 +259,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 		}
 
+		if(Objects.nonNull(vipGroupActivity.getAttribute3())){
+			Integer maxCourseNum = Integer.parseInt(vipGroupActivity.getAttribute3());
+			Integer requestCourseNum = vipGroupApplyBaseInfoDto.getOnlineClassesNum() + vipGroupApplyBaseInfoDto.getOfflineClassesNum();
+			if(requestCourseNum.compareTo(maxCourseNum)>0){
+				throw new BizException("该活动课时数为{}节", maxCourseNum);
+			}
+		}
+
 		int repeatVipGroups = vipGroupDao.countUserRepeatVipGroupInCourseStartEndTime(vipGroupApplyBaseInfoDto.getUserId(), firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
 		if(repeatVipGroups>0){
 			throw new BizException("请勿重复提交");

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.dal.entity.ImGroupMember;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
@@ -77,6 +78,12 @@ public class ImGroupController extends BaseController {
 		return succeed(imGroupService.update(imGroup));
 	}
 
+	@ApiOperation("修改群成员信息")
+	@PostMapping(value = "/updateGroupMember")
+	public Object updateGroupMember(@RequestBody ImGroupMember imGroupMember) {
+		return succeed(imGroupMemberService.update(imGroupMember));
+	}
+
 	@ApiOperation("查询群成员列表")
 	@GetMapping(value = "/queryGroupMemberList")
 	public Object queryGroupMemberList(Long imGroupId) {