2 Commity d40d0d79ca ... f9786d7aa4

Autor SHA1 Wiadomość Data
  yfh f9786d7aa4 Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration 2 tygodni temu
  yfh 32afb3f573 1、综合数据查询 2 tygodni temu

+ 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;
     private ISmsService smsService;
     @Autowired
     @Autowired
     private IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
     private IFsCoursePlaySourceConfigService fsCoursePlaySourceConfigService;
+    @Autowired
     private OpenIMService openIMService;
     private OpenIMService openIMService;
 
 
     @ApiOperation("注册app用户")
     @ApiOperation("注册app用户")
@@ -1041,6 +1042,6 @@ public class AppLoginController extends AppBaseController{
     @PostMapping("/getFriendList")
     @PostMapping("/getFriendList")
     public R getFriendList(@RequestBody UserRequestParam userRequestParam)
     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()));
     }
     }
 }
 }