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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 325f280..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
@@ -1,9 +1,9 @@
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;
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@@ -23,6 +23,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鍙傛暟*/
+ private String state;
/**鎵�灞為【闂爣璇�*/
private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
@@ -33,10 +35,25 @@
private Integer isSelectShop = 0;
/**鏄惁鏌ヨ鎺ㄨ崘浜轰俊鎭�:0鍚�1鏄�*/
private Integer isSelectInvitee = 0;
+ /**鏄惁鏌ヨ璧勯噾淇℃伅:0鍚�1鏄�*/
+ private Integer isSelectMoney = 0;
/**鏄惁鏈夐棬搴�*/
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
- /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
- private String appId;
+ /**寮�濮嬫椂闂�*/
+ 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