From 9030449dcf90628b7d7b28911c7843c97f04c103 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 24 九月 2022 14:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 1b97ce8..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
@@ -912,7 +912,7 @@
      * @param account
      * @return
      */
-    R resetPassword(Integer type,String account);
+    R resetPassword(Integer type,String account,String appId);
 
     /**
      * 天府通办登录
@@ -920,4 +920,21 @@
      * @return
      */
     R tfLogin(UuLoginVO uuLoginVO);
+
+    /**
+     * 三说会堂新增业务中心或专家账号
+     * */
+    R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+    /**
+     * 三说会堂后台重置密码
+     * */
+    R resetPassExpertOrIndustryCenter(String account,String password);
+
+    /**
+     * 用户授权
+     * @param userId
+     * @return
+     */
+    R accept(Long userId);
 }

--
Gitblit v1.7.1