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 |   86 +++++++++++++++++++++++--------------------
 1 files changed, 46 insertions(+), 40 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 9b58d74..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,53 +1,59 @@
 package com.hz.his.dto.user;
 
+import com.hz.his.dto.PageDto;
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.util.Date;
+
 
 /**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
 @Data
-public class UserDto {
-
+public class UserDto extends PageDto {
+    /**鏍囪瘑*/
     private String id;
+    /**鐢ㄦ埛鏍囪瘑*/
+    private String userId;
+    /**ciq*/
     private String CIQ;
+    /**浼氬憳鍙�*/
+    private String memberNO;
+    /**鍚嶇О*/
     private String name;
+    /**鎵嬫満鍙�*/
     private String tel;
-    /**鐢熸棩yyyy-MM-dd*/
-    private String birthDay;
-    /**棰嗗缓绯荤粺鐨刬d*/
-    private String apiId;
-    /**鐢ㄦ埛浼氬憳鍚嶇О*/
-    private String userLevel;
-    /**鐢ㄦ埛浼氬憳绛夌骇缂栫爜*/
-    private String hisNo;
-    /**鐢ㄦ埛浼氬憳绛夌骇id*/
-    private String memberLevelId;
-    /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
-    private String memberName;
-    /**鐢ㄦ埛浼氬憳绛夌骇鍥炬爣*/
-    private String memberImg;
-    /**鍌ㄥ�奸噾*/
-    private BigDecimal storedValueFund;
-    /**澧炲�奸噾*/
-    private BigDecimal valueAddedFund;
-    /**绉垎*/
-    private BigDecimal integral;
-    /**鏉ユ簮id,椤剁骇*/
-    private String channelId;
-    /**鏉ユ簮,椤剁骇*/
-    private String channelType;
-    /**浜岀骇鏉ユ簮id,鏈骇*/
-    private String channel2Id;
-    /**浜岀骇鏉ユ簮,鏈骇*/
-    private String channelType2;
-    /**閭�璇蜂汉id */
-    private String inviteeId;
-    /**娓犻亾鏉ユ簮绫诲瀷(UserChannelType) */
-    private String channelCategory;
-    /**鎵�灞為棬搴�*/
+    /**鎵�灞為棬搴楁爣璇�*/
     private String shopId;
-    /**鐢ㄦ埛瑙掕壊*/
-    private String userRole;
-    /**鐢ㄦ埛绫诲瀷*/
-    private String userType;
+    /**鍙傛暟*/
+    private String state;
+    /**鎵�灞為【闂爣璇�*/
+    private String hisCorpUserId;
+    /**鎵�灞為【闂悕绉�*/
+    private String beCorpUser;
+    /**鏄惁鏌ヨ鎵�灞為【闂俊鎭�:0鍚�1鏄�*/
+    private Integer isSelectCorp = 0;
+    /**鏄惁鏌ヨ鎵�灞為棬搴椾俊鎭�:0鍚�1鏄�*/
+    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