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/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 85f1882..7f52cd7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -380,7 +381,7 @@
* @param userId 登录用户
* @return 成员集合
*/
- R listFamily(Long userId);
+ R listFamily(Long userId,Long pageNum, Long pageSize);
/**
* 新增家庭成员
* @param comMngFamilyInfoVO 家庭成员基本信息
--
Gitblit v1.7.1