Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-09-26 2ebd707749baac527ef501a531467245e3dd5cdd

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

@@ -1463,7 +1463,12 @@
     * 三说会堂后台重置密码
     * */
    @GetMapping("/sanshuoResetPassword")
    public R sanshuoAddUser(@RequestParam("id") Long userId,@RequestParam("pass")String password){
        return userService.resetPassExpertOrIndustryCenter(userId,password);
    public R sanshuoAddUser(@RequestParam("account") String account,@RequestParam("pass")String password){
        return userService.resetPassExpertOrIndustryCenter(account,password);
    }

    @GetMapping("/accept")
    public R accept(@RequestParam("userId")Long userId){
        return userService.accept(userId);
    }
}