1.代码合并冲突

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

@@ -119,12 +119,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     private SysConfigService sysConfigService;
 
     @Autowired
-    private ImGroupService imGroupService;
-
-    @Autowired
-    private ImGroupMemberService imGroupMemberService;
-
-    @Autowired
     private TenantAlbumPurchaseMapper tenantAlbumPurchaseMapper;
 
     @Override