Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

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

@@ -127,6 +127,30 @@
    }

    /**
     * 重置密码
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPassword")
    public R resetPassword(@RequestParam("userId") Long userId) {
        return userService.resetPassword(userId);
    }

    /**
     * 批量重置密码
     *
     * @param userId
     *            新密码
     * @return 修改结果
     */
    @GetMapping("resetPasswordPatch")
    public R resetPasswordPatch(@RequestParam("userIds") Long[] userId) {
        return userService.resetPasswordPatch(userId);
    }

    /**
     * 某社区后台人员查询
     *
     * @param param
@@ -371,6 +395,19 @@
    }

    /**
     * 新增社区后台物业，社会组织，业主委员会账户
     *
     * @param administratorsUserVO
     *            账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstageproperty")
    public R adduserbackstageproperty(@RequestBody AdministratorsUserVO administratorsUserVO) {

        return userService.addUserBackstageProperty(administratorsUserVO);
    }

    /**
     * 删除后台用户
     *
     * @param administratorsUserVO