From 29167f6c5d895749f369fadbcd4b3c0a3a17052c Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 14 九月 2022 15:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index f46d494..bd264da 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1285,5 +1285,5 @@
* 三说会堂重置密码
* */
@GetMapping("/sanshuoResetPassword")
- R sanShuoResetPassword(@RequestParam("id") Long userId,@RequestParam("pass")String password);
+ R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
}
--
Gitblit v1.7.1