Merge branch 'test' into 'test_bak'

罗元桥

2021-09-27 faae303cd25f90b1c732b6bc737ede8b8ab714a0

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

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

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

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