From 15dbac0af6437e16b6606d5c790d614851493f02 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 16:05:37 +0800
Subject: [PATCH] Merge branch 'test'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 82d8f2e..78939ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -214,7 +214,9 @@
      * @return 成员集合
      */
     @PostMapping("listfamily")
-    R listFamily(@RequestParam("userId")Long userId);
+    R listFamily(@RequestParam("userId")Long userId,
+                 @RequestParam(value = "pageNum") Long pageNum,
+                 @RequestParam("pageNum") Long pageSize);
 
     /**
      * 新增家庭成员

--
Gitblit v1.7.1