From 14590de8e4fb23909f1767a53d1f92007f9bbcc4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 19 五月 2021 20:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index eac7344..243e05d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -270,7 +270,7 @@
@PostMapping("listfamily")
public R listFamily(@RequestParam("userId") Long userId,
@RequestParam(value = "pageNum") Long pageNum,
- @RequestParam("pageNum") Long pageSize) {
+ @RequestParam("pageSize") Long pageSize) {
return userService.listFamily(userId, pageNum, pageSize);
}
@@ -569,6 +569,17 @@
return userService.updateUserIsPartymember(idCard);
}
+
+ /**
+ * 修改用户为非党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateusernotpartymember")
+ R updateUserNotPartymember(@RequestParam("idCard")String idCard){
+ return userService.updateUserNotPartymember(idCard);
+ }
+
/**
* 获取各种协议
*
--
Gitblit v1.7.1