From 1cc34b1ca79017139b79756dcd6247eb47fc41b6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 21 十一月 2023 15:48:52 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
index 913d936..87a3ce0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -157,6 +157,18 @@
     /** 鎬у埆0鏈煡1鐢�2濂� */
     private Integer gender;
 
+    /**鏄惁杞瘖*/
+    private Integer isTransfer;
+    /**杞瘖淇℃伅*/
+    private UserTransferDto transferRecord;
+
+    /**涓昏璇夋眰**/
+    private String mainAppeal;
+    private String minorAppeal;
+
+    /**鏄惁澶勭悊鍙槸*/
+    private Integer isEditFamiliesRoom = 0;
+
     public UserParamDto() {
     }
 

--
Gitblit v1.8.0