From 37993b3cf3243e6ffdacab526b04dd2284565a42 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 25 七月 2024 18:59:31 +0800
Subject: [PATCH] Merge branch 'master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 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 d48a502..0d542e8 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
@@ -69,8 +70,27 @@
     private String email;
     /**澶村儚*/
     private String imgUrl;
-
-    private String userBelongingType;
-
     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