Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 eb4cfe7327323367a08ac449ce838f95b2e96783

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

@@ -45,8 +45,7 @@
    private UserService userService;
    @Resource
    private SysUserInputService sysUserInputService;
    @Resource
    private CommunityService communityService;


    /**
     * 新增微信用户
@@ -1471,6 +1470,15 @@
        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){
        return userService.accept(userId);
@@ -1481,11 +1489,5 @@
        return userService.addComPbCheckUser(comPbCheckUserDTO);
    }

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

}