From 2cd54a74f83835604df8f9774fe0f0172f514fac Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 10 十月 2023 19:00:35 +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 | 21 +++++++++++++++++++--
1 files changed, 19 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 9e9e894..b6421b0 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
@@ -13,20 +15,35 @@
private String userId;
/**ciq*/
private String CIQ;
+ /**浼氬憳鍙�*/
+ private String memberNO;
/**鍚嶇О*/
private String name;
/**鎵嬫満鍙�*/
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鎵�灞為【闂爣璇�*/
+ 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;
+
}
--
Gitblit v1.8.0