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

manailin

2021-09-30 438e0309b09a70224d6e5be0d60ac5b52aa6df48

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -702,6 +702,11 @@
    R resetPassword(Long userId);

    /**
     * 批量重置密码
     */
    R resetPasswordPatch(Long[] userId,String password);

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
     * @return 商家用户id
@@ -722,4 +727,10 @@
     * @return
     */
    R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);

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