From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 80db877..a5d985d 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,6 +3,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
@Data
@@ -71,6 +72,31 @@
private String imgUrl;
private String hisId;
private String userBelongingType;
+ //鐢电綉鍜ㄨ椤鹃棶(TMK) (Employee id)
+ private String internetCorpUserId;
+ //鎵�灞炴姢澹�
+ private String nurseCorpUserId;
+ //绗竴娆″埌搴楁椂闂�
+ private Date firstArriveTime;
+ //鏈�鍚庝竴娆″埌搴楁椂闂�
+ private Date lastArriveTime;
+ //绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date firstPayOrderTime;
+ //鏈�鍚庝竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date lastPayOrderTime;
+ //鏈�鍚庝竴娆℃墽琛屾椂闂�
+ private Date lastDeductionTime;
+ //openId
+ private String openId;
+ //鍏紬鍙穙penId
+ private String gzhOpenId;
+ //鏄惁鍚湁鐑帥鍚夐」鐩�
+ private Boolean isHaveRmj = false;
+ //娑堣垂鐜伴噾
+ private BigDecimal cashTotal = BigDecimal.ZERO;
- private String hisId;
+ /** 鎵�灞為【闂悕绉� */
+ private String adviserName;
+ /** RFM缁煎悎绛夌骇 */
+ private String rfmGrade;
}
--
Gitblit v1.8.0