From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 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 eeb2e00..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
@@ -49,6 +50,8 @@
     private String channelCategory;
     /**鎵�灞為棬搴�*/
     private String shopId;
+    /**鎵�灞為棬搴楀悕绉�*/
+    private String shopName;
     /**鐢ㄦ埛瑙掕壊*/
     private String userRole;
     /**鐢ㄦ埛绫诲瀷*/
@@ -57,4 +60,43 @@
     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 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 adviserName;
+    /** RFM缁煎悎绛夌骇 */
+    private String rfmGrade;
 }

--
Gitblit v1.8.0