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

huanghongfa

2021-04-28 43c6e133a84d50f4952cd1df2f409d07be338cc4

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -415,7 +415,7 @@

    /**
     * 人员详情
     *
     *detailuser
     * @param userId 用户id
     * @return 人员详情
     */
@@ -1501,10 +1501,13 @@
            String idCard = sysUserDO.getIdCard();
            if (!ObjectUtils.isEmpty(idCard)) {
                communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
                communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
                communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
                communityUserInfoVO.setIdCard(idCard);
            }
            communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
            communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
            communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
            communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
            communityUserInfoVO.setName(sysUserDO.getName());
            String phone = sysUserDO.getPhone();
            communityUserInfoVO.setPhone(phone);