From 5f5ed6db2a76e626b8d11d60a09db22b238388a0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 14:37:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   10 +++++++++-
 1 files changed, 9 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 222792e..afe0c49 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
@@ -1358,7 +1358,7 @@
         return userService.uuLogin(uuLoginVO);
     }
 
-    @PostMapping("/indexData")
+    @GetMapping("/indexData")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县,2:所有街道,3:所有社区,4:跟据街道筛选",dataType = "Integer"),
             @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
@@ -1367,4 +1367,12 @@
                        @RequestParam(value = "type",required = false) Long streetId){
         return userService.newIndexData(type,streetId);
     }
+
+    /**
+     *导出验证密码
+     */
+    @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