Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1285,6 +1285,18 @@
    @PostMapping("/tfLogin")
    R tfLogin(@RequestBody UuLoginVO uuLoginVO);

    /**
     * 三说会堂添加后台账户
     * */
    @PostMapping("/sanshuoAddUser")
    R sanShuoAddUser(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 三说会堂重置密码
     * */
    @GetMapping("/sanshuoResetPassword")
    R sanShuoResetPassword(@RequestParam("account") String account,@RequestParam("pass")String password);


    @GetMapping("/accept")
     R accept(@RequestParam("userId")Long userId);
@@ -1292,4 +1304,17 @@
    @PostMapping("/addComPbCheckUser")
     R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);



    /**
     * 是否为专家登陆小程序
     * */
    @GetMapping("/isSanShuoExpert")
    R isExpert(@RequestParam("number") String number);

    /**
     * 删除用户专家权限
     * */
    @GetMapping("/removeExpertRole")
    R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
}