From 61be4504c878c175dbd60d34feaace73ec5977ca Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 1 Nov 2022 10:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=AE=A1=E7=90=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E4=B8=BAsql?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2---=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcBirthRecordDTO.java         | 4 +++-
 .../main/java/com/epmet/dto/form/BirthRecordListFormDTO.java  | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
index 46bee9f321..6516b5161c 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcBirthRecordDTO.java
@@ -25,6 +25,8 @@ public class IcBirthRecordDTO implements Serializable {
      */
 	private String id;
 
+    private String icResiUserId;
+
     /**
      * 客户Id customer.id
      */
@@ -193,4 +195,4 @@ public class IcBirthRecordDTO implements Serializable {
     @JsonIgnore
 	private Date updatedTime;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java
index 207fafd28b..0fd1d33d65 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BirthRecordListFormDTO.java
@@ -22,8 +22,6 @@ public class BirthRecordListFormDTO extends PageFormDTO implements Serializable
     private String customerId;
     private String staffId;
 
-    private String icResiUserId;
-
     /**
      * 组织Id
      */