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/phis/dt/user/UserDt.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index a04cc54..3ffd64a 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -3,14 +3,18 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
-/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
+/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
@Data
public class UserDt {
-
+ /**鏍囪瘑*/
private String id;
+ /**ciq浼氬憳鍙�*/
private String CIQ;
+ /**鍚嶇О*/
private String name;
+ /**鎵嬫満鍙�*/
private String tel;
/**鐢熸棩yyyy-MM-dd*/
private String birthDay;
@@ -22,6 +26,8 @@
private String hisNo;
/**鐢ㄦ埛浼氬憳绛夌骇id*/
private String memberLevelId;
+ /**鏄惁vip*/
+ private Integer isVip = 0;
/**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
private String memberName;
/**鐢ㄦ埛浼氬憳绛夌骇鍥炬爣*/
@@ -46,8 +52,47 @@
private String channelCategory;
/**鎵�灞為棬搴�*/
private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
/**鐢ㄦ埛瑙掕壊*/
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
private String userType;
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
+ private String hisCorpUserId;
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
+ private String hisCorpUser;
+ /**鎬у埆*/
+ private Integer gender;
+ /**鑱屼笟绫诲瀷鍚嶇О*/
+ private String professionTypeName;
+ /**寰俊鍙�*/
+ private String wechat;
+ /**閭*/
+ private String email;
+ /**澶村儚*/
+ private String imgUrl;
+ private String hisId;
+ private String userBelongingType;
+ //鐢电綉鍜ㄨ椤鹃棶(TMK) (Employee id)
+ private String internetCorpUserId;
+ //鎵�灞炴姢澹�
+ private String nurseCorpUserId;
+ //绗竴娆″埌搴楁椂闂�
+ private Date firstArriveTime;
+ //绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date firstPayOrderTime;
+ //鏈�鍚庝竴娆℃墽琛屾椂闂�
+ private Date lastDeductionTime;
+ //openId
+ private String openId;
+ //鍏紬鍙穙penId
+ private String gzhOpenId;
+ //鏄惁鍚湁鐑帥鍚夐」鐩�
+ private Boolean isHaveRmj = false;
+
+ /** 鎵�灞為【闂悕绉� */
+ private String adviserName;
+ /** RFM缁煎悎绛夌骇 */
+ private String rfmGrade;
}
--
Gitblit v1.8.0