Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-20 bb2da5de17a6d959f91738c17868b312ee14e86b

 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);
    }

    /**
     * 获取各种协议
     *