From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 ed54f6e..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
@@ -3,6 +3,8 @@
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
+import java.util.Date;
+
 
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
@@ -21,16 +23,37 @@
     private String tel;
     /**鎵�灞為棬搴楁爣璇�*/
     private String shopId;
+    /**鍙傛暟*/
+    private String state;
     /**鎵�灞為【闂爣璇�*/
     private String hisCorpUserId;
     /**鎵�灞為【闂悕绉�*/
     private String beCorpUser;
     /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
-    private Integer isSelectCorp;
+    private Integer isSelectCorp = 0;
     /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
-    private Integer isSelectShop;
+    private Integer isSelectShop = 0;
+    /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectInvitee = 0;
+    /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+    private Integer isSelectMoney = 0;
     /**鏄惁鏈夐棬搴�*/
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
+    /**寮�濮嬫椂闂�*/
+    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