From 98fb96938258c6b966e007259860c9cdc8d5e2f2 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 05 二月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 0973a06..12eb2dc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -49,5 +49,10 @@
     private Integer isEvaluate;
     /**浼氬憳绫诲瀷*/
     private Integer memberType;
+    /**鏄惁鏌ヨtmk淇℃伅:0鍚�1鏄�*/
+    private Integer isTmk = 0;
+    /**鏄惁鏌ヨ骞撮緞:0鍚�1鏄�*/
+    private Integer isYear = 0;
+
 
 }

--
Gitblit v1.8.0