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 | 12 +++++++++++-
1 files changed, 11 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 fa7b371..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
@@ -23,6 +23,8 @@
private String tel;
/**鎵�灞為棬搴楁爣璇�*/
private String shopId;
+ /**鍙傛暟*/
+ private String state;
/**鎵�灞為【闂爣璇�*/
private String hisCorpUserId;
/**鎵�灞為【闂悕绉�*/
@@ -43,7 +45,15 @@
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