From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改
---
src/main/java/org/springblade/modules/friend/controller/FriendController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/friend/controller/FriendController.java b/src/main/java/org/springblade/modules/friend/controller/FriendController.java
index 42bf5ef..b595cb4 100644
--- a/src/main/java/org/springblade/modules/friend/controller/FriendController.java
+++ b/src/main/java/org/springblade/modules/friend/controller/FriendController.java
@@ -62,7 +62,7 @@
}
/**
- * 多表联合查询自定义分页
+ * 多表联合查询自定义分页（查看好友列表）
*/
@GetMapping("/page")
@ApiImplicitParams({
@@ -77,6 +77,25 @@
}
/**
+ * 查看好友申请
+ */
+ @GetMapping("/friendApplication")
+ public R<IPage<FriendVO>> friendApplication(@ApiIgnore FriendVO friend, Query query) {
+ IPage<FriendVO> pages = friendService.friendApplication(Condition.getPage(query), friend);
+ return R.data(pages);
+ }
+
+ /**
+ * 搜索好友
+ */
+ @GetMapping("/addFriend")
+ public R<IPage<FriendVO>> addFriend(@ApiIgnore FriendVO friend, Query query) {
+ IPage<FriendVO> pages = friendService.addFriend(Condition.getPage(query), friend);
+ return R.data(pages);
+ }
+
+
+ /**
* 新增
*/
@PostMapping("/save")
--
Gitblit v1.9.3