From f52dc5114638600e934cc82fe63c4a25f22594cc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 13 五月 2024 10:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 20 ++++++++++++++++----
1 files changed, 16 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 3768939..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,7 +1,5 @@
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;
@@ -25,6 +23,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鍙傛暟*/
+ private String state;
/**鎵�灞為【闂爣璇�*/
private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
@@ -35,13 +35,25 @@
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