From bceee99e4493c359e2c0872e4076d3db95718b71 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 09 五月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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 ab811e8..3140fc7 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
@@ -45,7 +45,15 @@
     private Date startTime;
     /**缁撴潫鏃堕棿*/
     private Date endTime;
-    //鏄惁璇勪环
+    /**鏄惁璇勪环*/
     private Integer isEvaluate;
+    /**浼氬憳绫诲瀷*/
+    private Integer memberType;
+    /**鏄惁鏌ヨtmk淇℃伅:0鍚�1鏄�*/
+    private Integer isTmk = 0;
+    /**鏄惁鏌ヨ骞撮緞:0鍚�1鏄�*/
+    private Integer isYear = 0;
+    /**鏄惁鏌ヨ浼樻儬鍒镐俊鎭�,0鍚�1鏄�*/
+    private Integer isSelectCoupon = 0;
 
 }

--
Gitblit v1.8.0