From 1a4b636cae41fdd15199beb1ea5df45b31de5b7d Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期三, 19 六月 2024 14:27:24 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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 9bfb10e..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,14 +3,57 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.Date;
+
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@Data
public class UserDto extends PageDto {
-
+ /**鏍囪瘑*/
private String id;
+ /**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**ciq*/
private String CIQ;
+ /**浼氬憳鍙�*/
+ private String memberNO;
+ /**鍚嶇О*/
private String name;
+ /**鎵嬫満鍙�*/
private String tel;
+ /**鎵�灞為棬搴楁爣璇�*/
+ private String shopId;
+ /**鍙傛暟*/
+ private String state;
+ /**鎵�灞為【闂爣璇�*/
+ private String hisCorpUserId;
+ /**鎵�灞為【闂悕绉�*/
+ private String beCorpUser;
+ /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+ private Integer isSelectCorp = 0;
+ /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+ 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