From 7285f70c4804d88c175ace932956eec524e2ceda Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 15 四月 2024 10:07:02 +0800
Subject: [PATCH] Merge branch 'master-fwq-颜值规划4.0' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 87a3ce0..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
@@ -166,8 +166,10 @@
     private String mainAppeal;
     private String minorAppeal;
 
-    /**鏄惁澶勭悊鍙槸*/
+    /**鏄惁澶勭悊绉戝*/
     private Integer isEditFamiliesRoom = 0;
+    /**鏄惁鍙戦�佷慨鏀圭瀹ら�氱煡*/
+    private Integer isEditFRSentNotice = 0;
 
     public UserParamDto() {
     }
@@ -187,9 +189,4 @@
     public static final String CATEGORY_EMPLOYEE = "employee";
     /**娓犻亾绫诲埆-鑷繁鏉�*/
     public static final String CATEGORY_ONESELF = "oneself";
-
-
-
-
-
 }

--
Gitblit v1.8.0