Merge branch 'zx_online_0407_black' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/ImUserFriendController.java

@@ -1,7 +1,6 @@
 package com.yonge.cooleshow.student.controller;
 
 
-import com.yonge.cooleshow.biz.dal.entity.ImUserFriend;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MK;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
@@ -11,12 +10,10 @@ import com.yonge.cooleshow.biz.dal.vo.im.ImUserFriendVO;
 import com.yonge.cooleshow.biz.dal.wrapper.im.ImUserWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
 
@@ -33,11 +30,11 @@ public class ImUserFriendController extends BaseController {
     /**
      * 服务对象
      */
-    @Resource
+    @Autowired
     private ImUserFriendService imUserFriendService;
-    @Resource
+    @Autowired
     private SysUserService sysUserService;
-    @Resource
+    @Autowired
     private ImGroupService imGroupService;
 
     @ApiImplicitParams({

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -29,7 +29,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.HashSet;
 import java.util.List;
@@ -49,9 +48,9 @@ public class ImGroupController extends BaseController {
     /**
      * 服务对象
      */
-    @Resource
+    @Autowired
     private ImGroupService imGroupService;
-    @Resource
+    @Autowired
     private SysUserService sysUserService;
 
     @Autowired