From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |    7 +++++++
 1 files changed, 7 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 48d240c..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
@@ -162,6 +162,13 @@
     /**杞瘖淇℃伅*/
     private UserTransferDto transferRecord;
 
+    /**涓昏璇夋眰**/
+    private String mainAppeal;
+    private String minorAppeal;
+
+    /**鏄惁澶勭悊鍙槸*/
+    private Integer isEditFamiliesRoom = 0;
+
     public UserParamDto() {
     }
 

--
Gitblit v1.8.0