From f4c8664c2d1c6d6e62f75433a27c5645942d5e85 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期五, 16 九月 2022 16:08:03 +0800
Subject: [PATCH] Merge branch 'acid_push' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 7 ++++++-
1 files changed, 6 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 8dc4c55..f1a78d8 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
@@ -145,7 +145,7 @@
R resetPassword(@RequestParam("userId") Long userId);
@GetMapping("/resetPasswordAccount")
- R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);
/**
* 批量重置密码用户登录密码默认admin123456
@@ -1274,4 +1274,9 @@
@PostMapping("/tfLogin")
R tfLogin(@RequestBody UuLoginVO uuLoginVO);
+
+
+ @GetMapping("/accept")
+ R accept(@RequestParam("userId")Long userId);
+
}
--
Gitblit v1.7.1