From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..8d99dba 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,20 @@
/** 鎬у埆0鏈煡1鐢�2濂� */
private Integer gender;
+ /**鏄惁杞瘖*/
+ private Integer isTransfer;
+ /**杞瘖淇℃伅*/
+ private UserTransferDto transferRecord;
+
+ /**涓昏璇夋眰**/
+ private String mainAppeal;
+ private String minorAppeal;
+
+ /**鏄惁澶勭悊绉戝*/
+ private Integer isEditFamiliesRoom = 0;
+ /**鏄惁鍙戦�佷慨鏀圭瀹ら�氱煡*/
+ private Integer isEditFRSentNotice = 0;
+
public UserParamDto() {
}
@@ -175,9 +189,4 @@
public static final String CATEGORY_EMPLOYEE = "employee";
/**娓犻亾绫诲埆-鑷繁鏉�*/
public static final String CATEGORY_ONESELF = "oneself";
-
-
-
-
-
}
--
Gitblit v1.8.0