From 653a27e1cc457f7bc887a6aa81ff00717e4282f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 13 六月 2024 10:33:52 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-爆款活动2.0

---
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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 674f3e6..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
@@ -1,7 +1,5 @@
 package com.hz.phis.dt.user;
 
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -80,13 +78,25 @@
     private String nurseCorpUserId;
     //绗竴娆″埌搴楁椂闂�
     private Date firstArriveTime;
+    //鏈�鍚庝竴娆″埌搴楁椂闂�
+    private Date lastArriveTime;
     //绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
     private Date firstPayOrderTime;
+    //鏈�鍚庝竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+    private Date lastPayOrderTime;
     //鏈�鍚庝竴娆℃墽琛屾椂闂�
     private Date lastDeductionTime;
     //openId
-    private Integer openId;
+    private String openId;
     //鍏紬鍙穙penId
-    private Integer gzhOpenId;
+    private String gzhOpenId;
+    //鏄惁鍚湁鐑帥鍚夐」鐩�
+    private Boolean isHaveRmj = false;
+    //娑堣垂鐜伴噾
+    private BigDecimal cashTotal = BigDecimal.ZERO;
 
+    /** 鎵�灞為【闂悕绉� */
+    private String adviserName;
+    /** RFM缁煎悎绛夌骇 */
+    private String rfmGrade;
 }

--
Gitblit v1.8.0