Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-18 0b47a5aee56e00f2d66d581bdd3c34cc32cd99b0

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1483,6 +1483,14 @@
        return userService.resetPassExpertOrIndustryCenter(account,password);
    }

    /**
     * 移除账号专家权限
     *
     */
    @GetMapping("/removeExpertRole")
    public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
        return userService.removeExpertRole(phone);
    }

    @GetMapping("/accept")
    public R accept(@RequestParam("userId")Long userId){