2 커밋 d40d0d79ca ... f9786d7aa4

작성자 SHA1 메시지 날짜
  yfh f9786d7aa4 Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration 2 주 전
  yfh 32afb3f573 1、综合数据查询 2 주 전
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

+ 2 - 1
fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -90,6 +90,7 @@ public class AppLoginController extends AppBaseController{
     private ISmsService smsService;
     @Autowired
     private IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
+    @Autowired
     private OpenIMService openIMService;
 
     @ApiOperation("注册app用户")
@@ -1041,6 +1042,6 @@ public class AppLoginController extends AppBaseController{
     @PostMapping("/getFriendList")
     public R getFriendList(@RequestBody UserRequestParam userRequestParam)
     {
-        return R.ok().put("date",openIMService.getFriendList(userRequestParam.getUserID(),userRequestParam.getPagination().getPageNumber(),userRequestParam.getPagination().getShowNumber(),userRequestParam.getApplyType()));
+        return R.ok().put("data",openIMService.getFriendList(userRequestParam.getUserID(),userRequestParam.getPagination().getPageNumber(),userRequestParam.getPagination().getShowNumber(),userRequestParam.getApplyType()));
     }
 }