From 2ebd707749baac527ef501a531467245e3dd5cdd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 26 九月 2022 10:11:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 bd264da..1c5a397 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
@@ -1286,4 +1286,9 @@
      * */
     @GetMapping("/sanshuoResetPassword")
     R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);
+
+
+    @GetMapping("/accept")
+     R accept(@RequestParam("userId")Long userId);
+
 }

--
Gitblit v1.7.1