From bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661 Mon Sep 17 00:00:00 2001 From: zhaozhengjie <237651143@qq.com> Date: 星期四, 08 九月 2022 15:23:37 +0800 Subject: [PATCH] Merge branch 'huacheng_push' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 d2488b7..c40c77f 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 @@ -1442,8 +1442,8 @@ } @GetMapping("/resetPasswordAccount") - public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account){ - return userService.resetPassword(type,account); + public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){ + return userService.resetPassword(type,account,appId); } @PostMapping("/tfLogin") -- Gitblit v1.7.1