Merge branch 'master' into 'test_bak'

罗元桥

2021-09-27 b8c8df1c425dcf2ff7a677647d3039073bde17f4

 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,@RequestParam("password")String password) {
        return userService.resetPasswordPatch(userId,password);
    }

    /**
     * 某社区后台人员查询
     *
     * @param param
@@ -368,6 +392,19 @@
    @PostMapping("putuserbackstage")
    R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
        return userService.putUserBackstage(administratorsUserVO);
    }

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

        return userService.addUserBackstageProperty(administratorsUserVO);
    }

    /**
@@ -1155,4 +1192,13 @@
    public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
        return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
    }

    /**
     * 根据openid维护社区团队里是否注册
     * @param openid    用户微信唯一标识
     */
    @PostMapping("judgeCommunityTeam")
    public void judgeCommunityTeam(@RequestParam("openid") String openid) {
        userService.judgeCommunityTeam(openid);
    }
}