From 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:04 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 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 323cbc9..180f447 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
@@ -11,6 +11,7 @@
 import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
 import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
 import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
 import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
 import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
 import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -920,4 +921,23 @@
      * @return
      */
     R tfLogin(UuLoginVO uuLoginVO);
+
+    /**
+     * 三说会堂新增业务中心或专家账号
+     * */
+    R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+    /**
+     * 三说会堂后台重置密码
+     * */
+    R resetPassExpertOrIndustryCenter(String account,String password);
+
+    /**
+     * 用户授权
+     * @param userId
+     * @return
+     */
+    R accept(Long userId);
+
+    R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
 }

--
Gitblit v1.7.1