From 63fbcaddd902bc4ab65e17b9dfe98118474c5c1a Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 03 八月 2023 19:14:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 61f3f46..8f95aba 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,8 +1,11 @@
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;
+import java.util.Date;
/**鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
@Data
@@ -49,10 +52,41 @@
private String channelCategory;
/**鎵�灞為棬搴�*/
private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
/**鐢ㄦ埛瑙掕壊*/
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
private String userType;
- /*鎵�灞為【闂�(閿�鍞【闂�)*/
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
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 firstPayOrderTime;
+ //鏈�鍚庝竴娆℃墽琛屾椂闂�
+ private Date lastDeductionTime;
+ //openId
+ private String openId;
+ //鍏紬鍙穙penId
+ private String gzhOpenId;
+
}
--
Gitblit v1.8.0