Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 20b528c879f3e96bf72516f58ac7341b204b12be

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -6,6 +6,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -772,4 +773,8 @@
    public R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId){
        return comPbMemberService.importPbMemberRole(memberRoleExcelVoList,communityId,userId);
    }
    @GetMapping("/checkMember")
    public R checkMember(@RequestParam("idCard")String idCard){
        return comPbMemberService.checkMember(idCard);
    }
}