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

huanghongfa

2021-10-15 08eefab8f0b04018dc62928ec2191bcae9d3e7d0

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

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
@@ -704,7 +705,7 @@
    /**
     * 批量重置密码
     */
    R resetPasswordPatch(Long[] userId);
    R resetPasswordPatch(Long[] userId,String password);

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

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

    /**
     * 数据看板升级版
     *
     * @return 运营后台数据看板升级版
     */
    R dataKanBans(DataKanBansDto dataKanBansDto);

    /**
     * 运营后台-用户数据统计汇总
     * @return  用户数据统计汇总
     */
    R communityStatistics();

    R communityStatisticsExport();
}