From 4957b28d9b87a3345c71f8348e7f08de0d1346de Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 14:59:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_elder_cedoo' into test_elder_cedoo

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
index 17bf70b..3712efe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -248,7 +248,7 @@
                 domicile = "暂无";
             }
             eldersAuthDO.setDomicile(domicile);
-            eldersAuthDO.setBirthDay(IdCard.birthDay(authUserDO.getIdCard()));
+            eldersAuthDO.setBirthDay(IdcardUtil.getBirthDate(authUserDO.getIdCard()));
             eldersAuthDO.setFamilyUserId(authUserDO.getId());
             eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
             eldersAuthDO.setType(2);
@@ -313,7 +313,7 @@
                         }
                     }
                 }
-                authUser.setAge(AgeUtils.getAgeFromBirthTimes(IdCard.birthDay(authUser.getIdCard()).getTime()));
+                authUser.setAge(IdcardUtil.getAgeByIdCard(authUser.getIdCard()));
             });
         }
         return R.ok(authUserAppVOIPage);

--
Gitblit v1.7.1