Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -693,6 +693,11 @@
        return userService.updateUserIsPartymember(idCard);
    }

    @PostMapping("updateuserispartymemberByPhone")
    public R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone) {
        return userService.updateUserIsPartymemberByPhone(phone);
    }

    /**
     * 修改用户为非党员状态
     *
@@ -1346,4 +1351,16 @@
        return userService.updateUserPartyStatus(userId);
    }

    @PostMapping("/uuLogin")
    public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
        return userService.uuLogin(uuLoginVO);
    }

    /**
     *导出验证密码
     */
    @GetMapping("/checkExport")
    public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
        return userService.checkExport(account,password,oldPassword);
    }
}