From cab9fbf8949104ddc190157f0add637f96c974c8 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Wed, 7 Aug 2024 17:11:42 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E7=88=B6=E4=BA=B2?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E5=8F=8D=E6=98=BE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/operate/web/result/BirthResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java index 308e5c7..fa4ee22 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java @@ -128,7 +128,7 @@ public class BirthResult { private String babyVillageId; public Integer getHmarriageAge() { - return DateUtil.getAge(husbandBirth); + return husbandBirth!=null?DateUtil.getAge(husbandBirth):hmarriageAge; } public void setHmarriageAge(Integer hmarriageAge) { -- 1.8.3.1