From 757e5dc619ddf01fbd9ec2c8c75b6663d79835cb Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 11 五月 2021 14:10:55 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 9 ++++++++-
1 files changed, 8 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..d6feca4 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
@@ -296,6 +297,12 @@
*/
R updateUserIsPartymember(String idCard);
/**
+ * 修改用户为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ R updateUserNotPartymember(String idCard);
+ /**
* 获取各种协议
* @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
@@ -380,7 +387,7 @@
* @param userId 登录用户
* @return 成员集合
*/
- R listFamily(Long userId);
+ R listFamily(Long userId,Long pageNum, Long pageSize);
/**
* 新增家庭成员
* @param comMngFamilyInfoVO 家庭成员基本信息
--
Gitblit v1.7.1