Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 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);
}