Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -1111,15 +1111,15 @@
            if(StringUtils.isEmpty(member.getCheckUnitName())){
                member.setCheckUnitName("待编辑报到单位");
            }
            member.setName(SensitiveUtil.replaceName(member.getName()));
            //member.setName(SensitiveUtil.replaceName(member.getName()));
        });
        return R.ok(memberPage);
    }

    @Override
    public R getPartyMember(Long userId,Integer type) {
    public R getPartyMember(String phone,Integer type) {

        return R.ok(comPbMemberDAO.selectDetail(userId,type));
        return R.ok(comPbMemberDAO.selectDetail(phone,type));
    }

    @Override