From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 12 ++++++++++--
1 files changed, 10 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 e3bc63e..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,8 +78,12 @@
private String nurseCorpUserId;
//绗竴娆″埌搴楁椂闂�
private Date firstArriveTime;
+ //鏈�鍚庝竴娆″埌搴楁椂闂�
+ private Date lastArriveTime;
//绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
private Date firstPayOrderTime;
+ //鏈�鍚庝竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date lastPayOrderTime;
//鏈�鍚庝竴娆℃墽琛屾椂闂�
private Date lastDeductionTime;
//openId
@@ -90,5 +92,11 @@
private String gzhOpenId;
//鏄惁鍚湁鐑帥鍚夐」鐩�
private Boolean isHaveRmj = false;
+ //娑堣垂鐜伴噾
+ private BigDecimal cashTotal = BigDecimal.ZERO;
+ /** 鎵�灞為【闂悕绉� */
+ private String adviserName;
+ /** RFM缁煎悎绛夌骇 */
+ private String rfmGrade;
}
--
Gitblit v1.8.0