Merge branch 'master' of http://git.dayaedu.com/yonge/mec into test

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

@@ -287,6 +287,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
 						throw new BizException("此课程没有学生");
 					}
+
 					//排除不被服务学员
 //					Set<Integer> serveStudentIds = studentServeService.getStudentWithCourse(teacherAttendance.getCourseScheduleId());
 //					Iterator<StudentCourseHomework> iterator = studentCourseHomeworks.iterator();

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) {