1.合并冲突

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -542,7 +542,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                         .collect(Collectors.toList());
                 orgGroupIdList.forEach(groupId -> {
                     try {
-                        imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
+                        imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT,true);
                     } catch (Exception e) {
                         log.error("学生注册，切换机构退群失败：{}", e.getMessage());
                     }
@@ -636,7 +636,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
                         .collect(Collectors.toList());
                 orgGroupIdList.forEach(groupId -> {
                     try {
-                        imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
+                        imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT,true);
                     } catch (Exception e) {
                         log.error("学生注册，切换机构退群失败：{}", e.getMessage());
                     }