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/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index e84df3f..5d7e687 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -929,5 +929,12 @@
     /**
      * 三说会堂后台重置密码
      * */
-    R resetPassExpertOrIndustryCenter(Long userId,String password);
+    R resetPassExpertOrIndustryCenter(String account,String password);
+
+    /**
+     * 用户授权
+     * @param userId
+     * @return
+     */
+    R accept(Long userId);
 }

--
Gitblit v1.7.1