From d6578ec702eb4fcff690d71ea3237a885f46b85c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 06 七月 2022 15:37:49 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 381637c..c1d90b0 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
@@ -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);
+    }
 }

--
Gitblit v1.7.1