From b156efaa0d9bc62c95d87f0b9ea916669c6c1d3e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 04 三月 2024 10:47:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test
---
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