From e023b237419249348ca4936a374197166779f066 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 14 八月 2023 16:34:39 +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 | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 8e69929..3768939 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
@@ -1,23 +1,47 @@
package com.hz.his.dto.user;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
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 hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
private String beCorpUser;
+ /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+ private Integer isSelectCorp = 0;
+ /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+ private Integer isSelectShop = 0;
+ /**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
+ private Integer isSelectInvitee = 0;
+ /**鏄惁鏈夐棬搴�*/
+ private Integer isHaveShop;
+ /**鏄惁鏈夐【闂�*/
+ private Integer isHaveCorp;
+
+ private Date startTime;
+
+ private Date endTime;
+
}
--
Gitblit v1.8.0