From 785641d8fd54a2a6442c7e5ee3e8accc38f34cee Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 2 Dec 2025 17:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E8=80=85=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BD=8F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nu/entity/ElderInfoEntity.java   |  7 +++++++
 .../modules/elderinfo/entity/ElderInfo.java   | 20 +++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java
index 83bd3e28..8d79504f 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java
@@ -239,4 +239,11 @@ public class ElderInfoEntity implements Serializable {
     //需要变更谁的信息 zz长者 jhr监护人
     private String modifyType;
 
+    /**
+     * 长者入住时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkinTime;
+
 }
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java
index d7eb36be..a08a39c6 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java
@@ -1,17 +1,18 @@
 package com.nu.modules.elderinfo.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 客户信息
@@ -362,4 +363,11 @@ public class ElderInfo implements Serializable {
     @Dict(dictTable = "nu_biz_employees_info",dicCode = "id",dicText = "name")
     private java.lang.String orderly;
 
+    /**
+     * 长者入住时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkinTime;
+
 }